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 336ab56c5ccd5878d9c71d8dcf4d8b754164c2a9..5a6f097fe1c659a683e9d37768b3fcd65548319b 100644 (file)
--- 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 7bfe6a3e23e7eb5ca8eb975f98760366d77bbbac..8ca71d9a4d1acd6353e294a4936d77f075e94b20 100644 (file)
--- 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 -%>