X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/fce5a24e33ca1581b6f9778e7ee6a1614651c8b4..95e1e4603eb8c32acf8ee58c845ec4ce5bfdd56c:/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 5b1881b71..71d840c34 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
#
@@ -42,6 +47,12 @@
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
#
@@ -143,7 +154,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
@@ -163,7 +174,7 @@
# Allow all proxy requests
#
- Allow from all
+ Require all granted
#
@@ -198,14 +209,12 @@
#
ProxySet lbmethod=bybusyness
+<% node[:web][:backends].each do |backend| -%>
<% if port == 443 -%>
- BalancerMember https://rails1 disablereuse=on
- BalancerMember https://rails2 disablereuse=on
- #BalancerMember https://rails3 disablereuse=on
+ BalancerMember https://<%= backend %> disablereuse=on
<% else -%>
- BalancerMember http://rails1
- BalancerMember http://rails2
- #BalancerMember http://rails3
+ BalancerMember http://<%= backend %>
+<% end -%>
<% end -%>
<% if port == 80 -%>