X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b7579691793f64a2cc7fd86930ed33ffcde88b98..4c86175022c9036999f9d8341e48cbd884448709:/cookbooks/web/templates/default/apache.frontend.erb?ds=inline diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb index d82b7e1da..0989ea791 100644 --- a/cookbooks/web/templates/default/apache.frontend.erb +++ b/cookbooks/web/templates/default/apache.frontend.erb @@ -20,7 +20,7 @@ # # Setup logging # - LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\" %Ts" combined_with_time + LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\" %Dus %{UNIQUE_ID}e %{SSL_PROTOCOL}x %{SSL_CIPHER}x" combined_with_time CustomLog /var/log/apache2/access.log combined_with_time ErrorLog /var/log/apache2/error.log @@ -30,6 +30,11 @@ ExpiresActive On RewriteEngine on + # + # Add the unique ID to the request headers + # + RequestHeader set X-Request-Id %{UNIQUE_ID}e + # # Block troublesome GPX data scrapping # @@ -136,9 +141,14 @@ 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 /favicon.ico <%= node[:web][:base_directory] %>/rails/app/assets/favicons/favicon.ico Alias /openlayers <%= node[:web][:base_directory] %>/rails/vendor/assets/openlayers Alias /stats /store/rails/stats Alias /user/image /store/rails/user/image @@ -193,9 +203,15 @@ # ProxySet lbmethod=bybusyness +<% if port == 443 -%> + 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 +<% end -%> <% if port == 80 -%> @@ -298,7 +314,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 @@ -323,4 +338,3 @@ Require all granted -<% end -%>