From: Tom Hughes <tom@compton.nu>
Date: Fri, 29 Aug 2014 12:57:00 +0000 (+0100)
Subject: Add some more apache 2.4 access rules
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/b428355a936c6508c7405479ea2e0f6c71233968

Add some more apache 2.4 access rules
---

diff --git a/cookbooks/web/templates/default/apache.backend.erb b/cookbooks/web/templates/default/apache.backend.erb
index 8e81aea9c..fb23055fe 100644
--- a/cookbooks/web/templates/default/apache.backend.erb
+++ b/cookbooks/web/templates/default/apache.backend.erb
@@ -67,6 +67,6 @@
 <% if node[:lsb][:release].to_f >= 14.04 -%>
 
 <Directory <%= node[:web][:base_directory] %>/rails/public>
-        Require all granted
+  Require all granted
 </Directory>
 <% end -%>
diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb
index 8ca71d9a4..76b172e0b 100644
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -307,6 +307,26 @@
 <% if node[:lsb][:release].to_f >= 14.04 -%>
 
 <Directory <%= node[:web][:base_directory] %>/rails/public>
-        Require all granted
+  Require all granted
+</Directory>
+
+<Directory /srv/www.openstreetmap.org/rails/app/assets>
+  Require all granted
+</Directory>
+
+<Directory /srv/www.openstreetmap.org/rails/vendor/assets>
+  Require all granted
+</Directory>
+
+<Directory /store/rails/stats>
+  Require all granted
+</Directory>
+
+<Directory /store/rails/user/image>
+  Require all granted
+</Directory>
+
+<Directory /store/rails/attachments>
+  Require all granted
 </Directory>
 <% end -%>