X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/9ae02e61f69a28e986eff71a64605a0cadb2df26..2ad512321474887989e2ec74af5ba5d62ac10b0c:/cookbooks/web/templates/default/apache.frontend.erb diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb index 9426be81a..d0dc52787 100644 --- a/cookbooks/web/templates/default/apache.frontend.erb +++ b/cookbooks/web/templates/default/apache.frontend.erb @@ -136,7 +136,11 @@ RailsEnv production PassengerMinInstances 10 PassengerMaxRequests 5000 +<% if port == 443 -%> + PassengerPreStart https://www.openstreetmap.org/ +<% else -%> PassengerPreStart http://www.openstreetmap.org/ +<% end -%> SetEnv SECRET_KEY_BASE <%= @secret_key_base %> Alias /favicon.ico <%= node[:web][:base_directory] %>/rails/app/assets/images/favicon.ico Alias /openlayers <%= node[:web][:base_directory] %>/rails/vendor/assets/openlayers @@ -194,9 +198,9 @@ ProxySet lbmethod=bybusyness <% if port == 443 -%> - BalancerMember https://rails1 - BalancerMember https://rails2 - BalancerMember https://rails3 + BalancerMember https://rails1 disablereuse=on + BalancerMember https://rails2 disablereuse=on + BalancerMember https://rails3 disablereuse=on <% else -%> BalancerMember http://rails1 BalancerMember http://rails2