Add apache 2.4 support to the mediawiki cookbook

diff --git a/cookbooks/mediawiki/templates/default/apache.erb b/cookbooks/mediawiki/templates/default/apache.erb
index 40e206d1bbb9ae0c16e9ec2f0de5a4432ef46fd6..6cbbc76e6d417b057a56e048e910be034f2272e7 100644 (file)
--- a/cookbooks/mediawiki/templates/default/apache.erb
+++ b/cookbooks/mediawiki/templates/default/apache.erb
@@ -48,6 +48,9 @@
 
   <Directory <%= @directory %>>
     Options -Indexes
+<% if node[:lsb][:release].to_f >= 14.04 -%>
+    Require all granted
+<% end -%>
   </Directory>
 
   <Directory <%= @mediawiki[:directory] %>/images/>
@@ -78,13 +81,21 @@
   </Directory>
 
   <Directory <%= @mediawiki[:directory] %>/maintenance/>
+<% if node[:lsb][:release].to_f >= 14.04 -%>
+    Require all denied
+<% else -%>
     Order allow,deny
     Deny from all
+<% end -%>
   </Directory>
 
   <Files <%= @mediawiki[:directory] %>/LocalSettings.php>
+<% if node[:lsb][:release].to_f >= 14.04 -%>
+    Require all denied
+<% else -%>
     Order allow,deny
     Deny from all
+<% end -%>
   </Files>
 
   <Directory <%= @mediawiki[:directory] %>/images/>
@@ -102,18 +113,30 @@
   </Directory>
 
   <Directory ~ "\.svn">
+<% if node[:lsb][:release].to_f >= 14.04 -%>
+    Require all denied
+<% else -%>
     Order allow,deny
     Deny from all
+<% end -%>
   </Directory>
 
   <Directory ~ "\.git">
+<% if node[:lsb][:release].to_f >= 14.04 -%>
+    Require all denied
+<% else -%>
     Order allow,deny
     Deny from all
+<% end -%>
   </Directory>
 
   <Files ~ "~$">
+<% if node[:lsb][:release].to_f >= 14.04 -%>
+    Require all denied
+<% else -%>
     Order allow,deny
     Deny from all
+<% end -%>
   </Files>
 </VirtualHost>
 <% if @mediawiki[:enable_ssl] -%>
@@ -167,6 +190,9 @@
 
   <Directory <%= @directory %>>
     Options -Indexes
+<% if node[:lsb][:release].to_f >= 14.04 -%>
+    Require all granted
+<% end -%>
   </Directory>
 
   <Directory <%= @mediawiki[:directory] %>/images/>
@@ -189,13 +215,21 @@
   </Directory>
 
   <Directory <%= @mediawiki[:directory] %>/maintenance/>
+<% if node[:lsb][:release].to_f >= 14.04 -%>
+    Require all denied
+<% else -%>
     Order allow,deny
     Deny from all
+<% end -%>
   </Directory>
 
   <Files <%= @mediawiki[:directory] %>/LocalSettings.php>
+<% if node[:lsb][:release].to_f >= 14.04 -%>
+    Require all denied
+<% else -%>
     Order allow,deny
     Deny from all
+<% end -%>
   </Files>
 
   <Directory <%= @mediawiki[:directory] %>/images/>
@@ -213,18 +247,30 @@
   </Directory>
 
   <Directory ~ "\.svn">
+<% if node[:lsb][:release].to_f >= 14.04 -%>
+    Require all denied
+<% else -%>
     Order allow,deny
     Deny from all
+<% end -%>
   </Directory>
 
   <Directory ~ "\.git">
+<% if node[:lsb][:release].to_f >= 14.04 -%>
+    Require all denied
+<% else -%>
     Order allow,deny
     Deny from all
+<% end -%>
   </Directory>
 
   <Files ~ "~$">
+<% if node[:lsb][:release].to_f >= 14.04 -%>
+    Require all denied
+<% else -%>
     Order allow,deny
     Deny from all
+<% end -%>
   </Files>
 </VirtualHost>
 <% end -%>