nominatim: temporarily disable cleanup of WAL archive

[chef.git] / cookbooks / web / templates / default / apache.backend.erb

diff --git a/cookbooks/web/templates/default/apache.backend.erb b/cookbooks/web/templates/default/apache.backend.erb
index cbe37f048e3fab893f156187c54cdd68bed00726..3f00b2ac67c7c57f3adba97008c6e414f4a8dea6 100644 (file)
--- a/cookbooks/web/templates/default/apache.backend.erb
+++ b/cookbooks/web/templates/default/apache.backend.erb
@@ -19,7 +19,7 @@
   #
   # Setup logging
   #
   #
   # 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
 
   CustomLog /var/log/apache2/access.log combined_with_time
   ErrorLog /var/log/apache2/error.log
 


@@ -28,6 +28,11 @@
   #
   RewriteEngine on
 
   #
   RewriteEngine on
 

+  #
+  # Recover the unique ID from the request headers
+  #
+  SetEnvIf X-Request-Id ^(.*)$ UNIQUE_ID=$1
+

   #
   # Configure rails
   #
   #
   # Configure rails
   #


@@ -35,7 +40,11 @@
   RailsEnv production
   PassengerMinInstances 3
   PassengerMaxRequests 500
   RailsEnv production
   PassengerMinInstances 3
   PassengerMaxRequests 500

+<% if port == 443 -%>
+  PassengerPreStart https://www.openstreetmap.org/
+<% else -%>

   PassengerPreStart http://www.openstreetmap.org/
   PassengerPreStart http://www.openstreetmap.org/

+<% end -%>

   SetEnv SECRET_KEY_BASE <%= @secret_key_base %>
 
   #
   SetEnv SECRET_KEY_BASE <%= @secret_key_base %>
 
   #