From 2ad512321474887989e2ec74af5ba5d62ac10b0c Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 11 Mar 2015 13:08:46 +0000 Subject: [PATCH] Use the right PreStart URL for the https virtual server --- cookbooks/web/templates/default/apache.backend.erb | 4 ++++ cookbooks/web/templates/default/apache.frontend.erb | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/cookbooks/web/templates/default/apache.backend.erb b/cookbooks/web/templates/default/apache.backend.erb index cbe37f048..d6dc4cd39 100644 --- a/cookbooks/web/templates/default/apache.backend.erb +++ b/cookbooks/web/templates/default/apache.backend.erb @@ -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 %> # diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb index ef06eeb83..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 -- 2.43.2