Add some more apache 2.4 access rules

[chef.git] / cookbooks / web / templates / default / apache.backend.erb

diff --git a/cookbooks/web/templates/default/apache.backend.erb b/cookbooks/web/templates/default/apache.backend.erb
index 7f3c3977b497a504eb8eb6f055c696b571f660f4..fb23055fe8b5f269aa79e5ca4ba603ad393db289 100644 (file)
--- a/cookbooks/web/templates/default/apache.backend.erb
+++ b/cookbooks/web/templates/default/apache.backend.erb
@@ -47,10 +47,26 @@
   #
   # Pass supported calls to cgimap
   #
+<% if node[:lsb][:release].to_f >= 14.04 -%>
+  RewriteRule ^/api/0\.6/map$ fcgi://127.0.0.1:8000$0 [P]
+<% else -%>
   RewriteRule ^/api/0\.6/map$ - [H=fcgi:127.0.0.1:8000]
+<% end -%>
   RewriteCond %{REQUEST_METHOD} ^(HEAD|GET)$
+<% if node[:lsb][:release].to_f >= 14.04 -%>
+  RewriteRule ^/api/0\.6/(node|way|relation)/[0-9]+$ fcgi://127.0.0.1:8000$0 [P]
+  RewriteRule ^/api/0\.6/(way|relation)/[0-9]+/full$ fcgi://127.0.0.1:8000$0 [P]
+  RewriteRule ^/api/0\.6/(nodes|ways|relations)$ fcgi://127.0.0.1:8000$0 [P]
+<% else -%>
   RewriteRule ^/api/0\.6/(node|way|relation)/[0-9]+$ - [H=fcgi:127.0.0.1:8000]
   RewriteRule ^/api/0\.6/(way|relation)/[0-9]+/full$ - [H=fcgi:127.0.0.1:8000]
   RewriteRule ^/api/0\.6/(nodes|ways|relations)$ - [H=fcgi:127.0.0.1:8000]
+<% end -%>
 </VirtualHost>
 <% end -%>
+<% if node[:lsb][:release].to_f >= 14.04 -%>
+
+<Directory <%= node[:web][:base_directory] %>/rails/public>
+  Require all granted
+</Directory>
+<% end -%>