Gradually move some more stuff to the IC backends.

[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..ea64b6fa497fa284f665aba78319d3c8519b2d91 100644 (file)
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -20,7 +20,7 @@
   #
   # Setup logging
   #
   #
   # 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
 
   CustomLog /var/log/apache2/access.log combined_with_time
   ErrorLog /var/log/apache2/error.log
 


@@ -30,6 +30,16 @@
   ExpiresActive On
   RewriteEngine on
 
   ExpiresActive On
   RewriteEngine on
 

+  #
+  # Add the unique ID to the request headers
+  #
+  RequestHeader set X-Request-Id %{UNIQUE_ID}e
+
+  #
+  # Remove Proxy request header to mitigate https://httpoxy.org/
+  #
+  RequestHeader unset Proxy early
+

   #
   # Block troublesome GPX data scrapping
   #
   #
   # Block troublesome GPX data scrapping
   #


@@ -42,6 +52,12 @@
   RewriteCond %{HTTP_USER_AGENT} tilesAtHome
   RewriteRule . - [F,L]
 
   RewriteCond %{HTTP_USER_AGENT} tilesAtHome
   RewriteRule . - [F,L]
 

+  #
+  # Block changeset scraper
+  #
+  RewriteCond %{HTTP_USER_AGENT} "OSMApp Tuner"
+  RewriteRule . - [F,L]  
+

   #
   # Block requests for the old 404 map tile
   #
   #
   # Block requests for the old 404 map tile
   #


@@ -143,7 +159,7 @@
   PassengerPreStart http://www.openstreetmap.org/
 <% end -%>
   SetEnv SECRET_KEY_BASE <%= @secret_key_base %>
   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
   Alias /openlayers <%= node[:web][:base_directory] %>/rails/vendor/assets/openlayers
   Alias /stats /store/rails/stats
   Alias /user/image /store/rails/user/image


@@ -163,17 +179,18 @@
   # Allow all proxy requests
   #
   <Proxy *>
   # Allow all proxy requests
   #
   <Proxy *>

-    Allow from all
+    Require all granted

   </Proxy>
 
   #
   # Pass some other API calls to the backends via a load balancer
   #
   </Proxy>
 
   #
   # Pass some other API calls to the backends via a load balancer
   #

-  ProxyPass /api/0.6/map balancer://backend/api/0.6/map
-  ProxyPass /api/0.6/tracepoints balancer://backend/api/0.6/tracepoints
-  ProxyPass /api/0.6/amf/read balancer://backend/api/0.6/amf/read
-  ProxyPass /api/0.6/swf/trackpoints balancer://backend/api/0.6/swf/trackpoints
-  ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/(upload|download))$ balancer://backend$1
+  ProxyPass /api/0.6/map balancer://bytemark/api/0.6/map
+  ProxyPass /api/0.6/tracepoints balancer://bytemark/api/0.6/tracepoints
+  ProxyPass /api/0.6/amf/read balancer://bytemark/api/0.6/amf/read
+  ProxyPass /api/0.6/swf/trackpoints balancer://bytemark/api/0.6/swf/trackpoints
+  ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/upload)$ balancer://bytemark$1
+  ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/download)$ balancer://bytemark$1

   ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+)$ balancer://backend$1
   ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+/(full|history|search|ways))$ balancer://backend$1
   ProxyPass /api/0.6/nodes balancer://backend/api/0.6/nodes
   ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+)$ balancer://backend$1
   ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+/(full|history|search|ways))$ balancer://backend$1
   ProxyPass /api/0.6/nodes balancer://backend/api/0.6/nodes


@@ -194,18 +211,30 @@
   RedirectPermanent /images/cc_button.png http://www.openstreetmap.org/assets/cc_button.png
 
   #
   RedirectPermanent /images/cc_button.png http://www.openstreetmap.org/assets/cc_button.png
 
   #

-  # Define a load balancer for the backends
+  # Define a load balancer for the local backends

   #
   <Proxy balancer://backend>
     ProxySet lbmethod=bybusyness
   #
   <Proxy balancer://backend>
     ProxySet lbmethod=bybusyness

+<% (node[:web][:backends] + ["rails4.bm", "rails5.bm"]).each do |backend| -%>

 <% if port == 443 -%>
 <% if port == 443 -%>

-    BalancerMember https://rails1 disablereuse=on
-    BalancerMember https://rails2 disablereuse=on
-    #BalancerMember https://rails3 disablereuse=on
+    BalancerMember https://<%= backend %> disablereuse=on

 <% else -%>
 <% else -%>

-    BalancerMember http://rails1
-    BalancerMember http://rails2
-    #BalancerMember http://rails3
+    BalancerMember http://<%= backend %>
+<% end -%>
+<% end -%>
+  </Proxy>
+
+  #
+  # Define a load balancer for the Bytemark backends
+  #
+  <Proxy balancer://bytemark>
+    ProxySet lbmethod=bybusyness
+<% ["rails4.bm", "rails5.bm"].each do |backend| -%>
+<% if port == 443 -%>
+    BalancerMember https://<%= backend %> disablereuse=on
+<% else -%>
+    BalancerMember http://<%= backend %>
+<% end -%>

 <% end -%>
   </Proxy>
 <% if port == 80 -%>
 <% end -%>
   </Proxy>
 <% if port == 80 -%>