From: Tom Hughes <tom@compton.nu>
Date: Tue, 19 Aug 2014 20:58:11 +0000 (+0100)
Subject: Update to apache 2.4 access controls
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/7cc2c6d477c5255d13bf26f676afb769d337ab20?hp=c3fb201b9e6ef157f11352b712e744fc8b03995d

Update to apache 2.4 access controls
---

diff --git a/cookbooks/wordpress/templates/default/apache.erb b/cookbooks/wordpress/templates/default/apache.erb
index 997b44322..3695fc2b7 100644
--- 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]
+
     Options -Indexes
+
+    Require all granted
   </Directory>
 
   <Files <%= @directory %>/wp-config.php>
-    Order allow,deny
-    Deny from all
+    Require all denied
   </Files>
 
   <Directory <%= @directory %>/uploads>
@@ -68,17 +70,14 @@
   </Directory>
 
   <Directory ~ "\.svn">
-    Order allow,deny
-    Deny from all
+    Require all denied
   </Directory>
 
   <Directory ~ "\.git">
-    Order allow,deny
-    Deny from all
+    Require all denied
   </Directory>
 
   <Files ~ "~$">
-    Order allow,deny
-    Deny from all
+    Require all denied
   </Files>
 </VirtualHost>