X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/b428355a936c6508c7405479ea2e0f6c71233968..46e1a87a978114272a58c1f1fe4db3c3741ee925:/cookbooks/web/templates/default/apache.frontend.erb?ds=sidebyside
diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb
index 76b172e0b..5b1881b71 100644
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -136,7 +136,12 @@
RailsEnv production
PassengerMinInstances 10
PassengerMaxRequests 5000
+ PassengerMaxRequestQueueSize 250
+<% 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,13 +199,13 @@
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
- BalancerMember http://rails3
+ #BalancerMember http://rails3
<% end -%>
<% if port == 80 -%>
@@ -304,7 +309,6 @@
RedirectPermanent /events.ics http://calendar.openstreetmap.org.uk/events.ics
RedirectPermanent / http://www.openstreetmap.org/
-<% if node[:lsb][:release].to_f >= 14.04 -%>
/rails/public>
Require all granted
@@ -329,4 +333,3 @@
Require all granted
-<% end -%>