Install nodejs legacy symlink on 14.04

[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 fb23055fe8b5f269aa79e5ca4ba603ad393db289..d6dc4cd396460d05390eab93d0e36d8568cbaf43 100644 (file)
--- a/cookbooks/web/templates/default/apache.backend.erb
+++ b/cookbooks/web/templates/default/apache.backend.erb
@@ -19,7 +19,7 @@
   #
   # Setup logging
   #
-  LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\" %Ts" combined_with_time
+  LogFormat "%a %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\" %Ts" combined_with_time
   CustomLog /var/log/apache2/access.log combined_with_time
   ErrorLog /var/log/apache2/error.log
 
@@ -35,7 +35,11 @@
   RailsEnv production
   PassengerMinInstances 3
   PassengerMaxRequests 500
+<% if port == 443 -%>
+  PassengerPreStart https://www.openstreetmap.org/
+<% else -%>
   PassengerPreStart http://www.openstreetmap.org/
+<% end -%>
   SetEnv SECRET_KEY_BASE <%= @secret_key_base %>
 
   #
@@ -47,26 +51,14 @@
   #
   # 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 -%>