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 91a901e45337cc1fccdc8ac4b2e5c573dec39361..24b87902bca4ca8845e64767fe71186d2454c388 100644 (file)
--- 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>