From: Tom Hughes <tom@compton.nu>
Date: Fri, 29 Aug 2014 08:10:27 +0000 (+0100)
Subject: Use apache 2.4 style access controls
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/3dc447a5e3c9637b6f999475ad7d572eec8877cf

Use apache 2.4 style access controls
---

diff --git a/cookbooks/web/templates/default/apache.backend.erb b/cookbooks/web/templates/default/apache.backend.erb
index 336ab56c5..5a6f097fe 100644
--- a/cookbooks/web/templates/default/apache.backend.erb
+++ b/cookbooks/web/templates/default/apache.backend.erb
@@ -60,3 +60,9 @@
 <% end -%>
 </VirtualHost>
 <% end -%>
+<% if node[:lsb][:release].to_f >= 14.04 -%>
+
+<Directory <%= node[:web][:base_directory] %>/rails/public>
+        Require all granted
+</Directory>
+<% end -%>
diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb
index 7bfe6a3e2..8ca71d9a4 100644
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -304,3 +304,9 @@
   RedirectPermanent /events.ics http://calendar.openstreetmap.org.uk/events.ics
   RedirectPermanent / http://www.openstreetmap.org/
 </VirtualHost>
+<% if node[:lsb][:release].to_f >= 14.04 -%>
+
+<Directory <%= node[:web][:base_directory] %>/rails/public>
+        Require all granted
+</Directory>
+<% end -%>