From: Tom Hughes <tom@compton.nu>
Date: Wed, 29 Apr 2015 19:27:50 +0000 (+0100)
Subject: Support apache 2.4 permissions on tile servers
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/01e4f572782563692eb2628d322cc6eb3eb19c59

Support apache 2.4 permissions on tile servers
---

diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb
index 91a901e45..24b87902b 100644
--- a/cookbooks/tile/templates/default/apache.erb
+++ b/cookbooks/tile/templates/default/apache.erb
@@ -47,13 +47,21 @@
 <Directory /srv/tile.openstreetmap.org/html>
   Options None
   AllowOverride None
+<% if node[:lsb][:release].to_f >= 14.04 -%>
+  Require all granted
+<% else -%>
   Order allow,deny
   Allow from all
+<% end -%>
 </Directory>
 
 <Directory /srv/tile.openstreetmap.org/cgi-bin>
   Options ExecCGI
   AllowOverride None
+<% if node[:lsb][:release].to_f >= 14.04 -%>
+  Require all granted
+<% else -%>
   Order allow,deny
   Allow from all
+<% end -%>
 </Directory>