Add a request ID to connect frontend and backend logs

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

diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb
index 5b1881b71f4ca6f858672e39666e99f7bc6e7e14..d0260be3dcdfba512676dfbc4419e60e71c7ba02 100644 (file)
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -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
   #
@@ -143,7 +148,7 @@
   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
@@ -201,11 +206,11 @@
 <% if port == 443 -%>
     BalancerMember https://rails1 disablereuse=on
     BalancerMember https://rails2 disablereuse=on
-    #BalancerMember https://rails3 disablereuse=on
+    BalancerMember https://rails3 disablereuse=on
 <% else -%>
     BalancerMember http://rails1
     BalancerMember http://rails2
-    #BalancerMember http://rails3
+    BalancerMember http://rails3
 <% end -%>
   </Proxy>
 <% if port == 80 -%>