summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-01-27 21:12:07 +0100
committervarac <varacanero@zeromail.org>2016-01-27 21:12:07 +0100
commit8effa368557761c23f5496d4a26554b9cec6036c (patch)
tree0b05c25e79b28098b8c60c7e8dfee270a76c4695 /puppet
parent33cf7e313cf9dfa2e5ac0e8eeb91cacb016ebe62 (diff)
[bug] [jessie] Fix apache 2.4 auth directives
- Resolves: #7853
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_static/templates/amber.erb4
-rw-r--r--puppet/modules/site_static/templates/rack.erb6
2 files changed, 9 insertions, 1 deletions
diff --git a/puppet/modules/site_static/templates/amber.erb b/puppet/modules/site_static/templates/amber.erb
index 48df555e..694f1136 100644
--- a/puppet/modules/site_static/templates/amber.erb
+++ b/puppet/modules/site_static/templates/amber.erb
@@ -4,6 +4,10 @@
<%- end -%>
<Directory "<%=@directory%>/">
AllowOverride FileInfo Indexes Options=All,MultiViews
+<% if scope.function_guess_apache_version([]) == '2.4' %>
+ Require all granted
+<% else %>
Order deny,allow
Allow from all
+<% end %>
</Directory>
diff --git a/puppet/modules/site_static/templates/rack.erb b/puppet/modules/site_static/templates/rack.erb
index d70d3ddb..431778bb 100644
--- a/puppet/modules/site_static/templates/rack.erb
+++ b/puppet/modules/site_static/templates/rack.erb
@@ -9,7 +9,11 @@
</Location>
<%- end -%>
<Directory "<%=@directory%>">
+ Options -MultiViews
+<% if scope.function_guess_apache_version([]) == '2.4' %>
+ Require all granted
+<% else %>
Order deny,allow
Allow from all
- Options -MultiViews
+<% end %>
</Directory>