X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/4f10eb951399adea7cd598b2d763969c735bc888..2885ab2d75bca192999d4140db191b00d918b974:/cookbooks/mediawiki/templates/default/apache.erb

diff --git a/cookbooks/mediawiki/templates/default/apache.erb b/cookbooks/mediawiki/templates/default/apache.erb
index 40e206d1b..0c9dd3f3c 100644
--- a/cookbooks/mediawiki/templates/default/apache.erb
+++ b/cookbooks/mediawiki/templates/default/apache.erb
@@ -48,6 +48,7 @@
 
   <Directory <%= @directory %>>
     Options -Indexes
+    Require all granted
   </Directory>
 
   <Directory <%= @mediawiki[:directory] %>/images/>
@@ -55,6 +56,10 @@
     php_admin_flag engine off
     Options -ExecCGI -Includes -Indexes
     AllowOverride None
+    AddType text/plain .html .htm .shtml
+<% if @mediawiki[:private] -%>
+    Require all denied
+<% end -%>
   </Directory>
 
   <Directory <%= @mediawiki[:directory] %>/images/thumb/>
@@ -78,22 +83,13 @@
   </Directory>
 
   <Directory <%= @mediawiki[:directory] %>/maintenance/>
-    Order allow,deny
-    Deny from all
+    Require all denied
   </Directory>
 
   <Files <%= @mediawiki[:directory] %>/LocalSettings.php>
-    Order allow,deny
-    Deny from all
+    Require all denied
   </Files>
 
-  <Directory <%= @mediawiki[:directory] %>/images/>
-    Options -ExecCGI -Includes -Indexes
-    AllowOverride None
-    AddType text/plain .html .htm .shtml
-    php_admin_flag engine off
-  </Directory>
-
   <Directory <%= @mediawiki[:directory] %>/cache/>
     Options -ExecCGI -Includes -Indexes
     AllowOverride None
@@ -102,18 +98,15 @@
   </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>
 <% if @mediawiki[:enable_ssl] -%>
@@ -167,6 +160,7 @@
 
   <Directory <%= @directory %>>
     Options -Indexes
+    Require all granted
   </Directory>
 
   <Directory <%= @mediawiki[:directory] %>/images/>
@@ -174,6 +168,9 @@
     php_admin_flag engine off
     Options -ExecCGI -Includes -Indexes
     AllowOverride None
+<% if @mediawiki[:private] -%>
+    Require all denied
+<% end -%>
   </Directory>
 
   <Directory <%= @mediawiki[:directory] %>/images/thumb/>
@@ -189,13 +186,11 @@
   </Directory>
 
   <Directory <%= @mediawiki[:directory] %>/maintenance/>
-    Order allow,deny
-    Deny from all
+    Require all denied
   </Directory>
 
   <Files <%= @mediawiki[:directory] %>/LocalSettings.php>
-    Order allow,deny
-    Deny from all
+    Require all denied
   </Files>
 
   <Directory <%= @mediawiki[:directory] %>/images/>
@@ -213,18 +208,15 @@
   </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>
 <% end -%>