X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b20fd2a506d32067716e1d637ed3bf1f87cffe92..080f49f493bbd95abd2e4510e5e2270f5ddced57:/cookbooks/web/templates/default/apache.backend.erb?ds=inline

diff --git a/cookbooks/web/templates/default/apache.backend.erb b/cookbooks/web/templates/default/apache.backend.erb
index cbe37f048..aed339f4f 100644
--- a/cookbooks/web/templates/default/apache.backend.erb
+++ b/cookbooks/web/templates/default/apache.backend.erb
@@ -19,7 +19,7 @@
   #
   # Setup logging
   #
-  LogFormat "%a %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\" %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
 
@@ -28,6 +28,11 @@
   #
   RewriteEngine on
 
+  #
+  # Recover the unique ID from the request headers
+  #
+  SetEnvIf X-Request-Id ^(.*)$ UNIQUE_ID=$1
+
   #
   # Configure rails
   #
@@ -35,7 +40,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 %>
 
   #
@@ -43,6 +52,14 @@
   #
   RemoteIPHeader X-Forwarded-For
   RemoteIPTrustedProxy 146.179.159.160/27
+  RemoteIPTrustedProxy 10.0.32.0/24
+
+  #
+  # Pass authentication related headers to cgimap
+  #
+  <Location />
+    CGIPassAuth On
+  </Location>
 
   #
   # Pass supported calls to cgimap