Disable SSLv3

[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 336ab56c5ccd5878d9c71d8dcf4d8b754164c2a9..6128b322c05e429012214dce87edc2d1cdb0466b 100644 (file)
--- a/cookbooks/web/templates/default/apache.backend.erb
+++ b/cookbooks/web/templates/default/apache.backend.erb
@@ -47,16 +47,14 @@
   #
   # Pass supported calls to cgimap
   #
   #
   # Pass supported calls to cgimap
   #

-  RewriteRule ^/api/0\.6/map$ - [H=fcgi:127.0.0.1:8000]
+  RewriteRule ^/api/0\.6/map$ fcgi://127.0.0.1:8000$0 [P]

   RewriteCond %{REQUEST_METHOD} ^(HEAD|GET)$
   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]
   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 -%>
 </VirtualHost>
 <% end -%>

+
+<Directory <%= node[:web][:base_directory] %>/rails/public>
+  Require all granted
+</Directory>