Use apache 2.4 style access controls

diff --git a/cookbooks/cgiirc/templates/default/apache.erb b/cookbooks/cgiirc/templates/default/apache.erb
index ea6ada67bf9e73d14b16b4d7deb485dc05104556..025892c740af6e08e66489b166d48857efa802ec 100644 (file)
--- a/cookbooks/cgiirc/templates/default/apache.erb
+++ b/cookbooks/cgiirc/templates/default/apache.erb
@@ -13,6 +13,11 @@
 
        <Directory "/usr/lib/cgi-bin/cgiirc">
                AddHandler cgi-script .cgi
+               Require all granted
+       </Directory>
+
+       <Directory "/usr/share/images/cgiirc">
+               Require all granted
        </Directory>
 
        <IfModule mod_deflate.c>

diff --git a/cookbooks/dns/templates/default/apache.erb b/cookbooks/dns/templates/default/apache.erb
index 478ca4262da556830c7ab5ace8169eb5ed72c6fd..31f8eebaea189bf5af97c870db239c473d1b91f1 100644 (file)
--- a/cookbooks/dns/templates/default/apache.erb
+++ b/cookbooks/dns/templates/default/apache.erb
@@ -10,3 +10,7 @@
        DocumentRoot <%= @directory %>/html
        Alias /json/ /var/lib/dns/json/
 </VirtualHost>
+
+<Directory <%= @directory %>/html>
+       Require all granted
+</Directory>

diff --git a/cookbooks/mailman/templates/default/apache.erb b/cookbooks/mailman/templates/default/apache.erb
index 7e40079622a42616d8c6109ce2cd366e5aa95238..2262c3fa280b4f19d68c921dcafebca51536c47b 100644 (file)
--- a/cookbooks/mailman/templates/default/apache.erb
+++ b/cookbooks/mailman/templates/default/apache.erb
@@ -36,6 +36,7 @@
        <Directory /var/lib/mailman/archives/>
                Options Indexes FollowSymLinks
                AllowOverride None
+               Require all granted
        </Directory>
 
        Alias /pipermail/ /var/lib/mailman/archives/public/
@@ -54,7 +55,7 @@
        ScriptAlias /subscribe /usr/lib/cgi-bin/mailman/subscribe
        ScriptAlias /mailman/ /usr/lib/cgi-bin/mailman/
 
-       <Location ~ "/pipermail/([^/]+)/(2004|2005|2006|2007|2008|2009)">
+       <Location ~ "/pipermail/([^/]+)/(2004|2005|2006|2007|2008|2009|2010|2011|2012|2013|2014)">
                ExpiresActive On
                ExpiresDefault "access plus 180 days"
        </Location>

diff --git a/cookbooks/trac/templates/default/apache.erb b/cookbooks/trac/templates/default/apache.erb
index 255ed18dd955f5c38a25327d3e69f497bea0096b..f56b9e83766953a996a390c24458c34ec1587ef9 100644 (file)
--- a/cookbooks/trac/templates/default/apache.erb
+++ b/cookbooks/trac/templates/default/apache.erb
@@ -37,3 +37,7 @@ WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> maximum-req
                Require valid-user
        </Location>
 </VirtualHost>
+
+<Directory <%= @directory %>/htdocs>
+       Require all granted
+</Directory>