Update to apache 2.4 access controls

diff --git a/cookbooks/wordpress/templates/default/apache.erb b/cookbooks/wordpress/templates/default/apache.erb
index 997b44322cb6a3b9874dd8c8576dbad957b1eba0..3695fc2b7ead29c975a23ad467dfe9447883f60b 100644 (file)
--- a/cookbooks/wordpress/templates/default/apache.erb
+++ b/cookbooks/wordpress/templates/default/apache.erb
@@ -53,12 +53,14 @@
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteCond %{REQUEST_FILENAME} !-d
     RewriteRule . /index.php [L]
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteCond %{REQUEST_FILENAME} !-d
     RewriteRule . /index.php [L]

+

     Options -Indexes
     Options -Indexes

+
+    Require all granted

   </Directory>
 
   <Files <%= @directory %>/wp-config.php>
   </Directory>
 
   <Files <%= @directory %>/wp-config.php>

-    Order allow,deny
-    Deny from all
+    Require all denied

   </Files>
 
   <Directory <%= @directory %>/uploads>
   </Files>
 
   <Directory <%= @directory %>/uploads>


@@ -68,17 +70,14 @@
   </Directory>
 
   <Directory ~ "\.svn">
   </Directory>
 
   <Directory ~ "\.svn">

-    Order allow,deny
-    Deny from all
+    Require all denied

   </Directory>
 
   <Directory ~ "\.git">
   </Directory>
 
   <Directory ~ "\.git">

-    Order allow,deny
-    Deny from all
+    Require all denied

   </Directory>
 
   <Files ~ "~$">
   </Directory>
 
   <Files ~ "~$">

-    Order allow,deny
-    Deny from all
+    Require all denied

   </Files>
 </VirtualHost>
   </Files>
 </VirtualHost>