X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/11d0975caf6d12fb54162b81a554e1b6c1e6317a..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 0312712bc..71d840c34 100644
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -14,12 +14,13 @@
# Enable SSL
#
SSLEngine on
+ SSLProxyEngine on
<% end -%>
#
# 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
@@ -29,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
#
@@ -41,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
#
@@ -135,8 +147,14 @@
RailsEnv production
PassengerMinInstances 10
PassengerMaxRequests 5000
+ PassengerMaxRequestQueueSize 250
+<% if port == 443 -%>
+ PassengerPreStart https://www.openstreetmap.org/
+<% else -%>
PassengerPreStart http://www.openstreetmap.org/
- Alias /favicon.ico <%= node[:web][:base_directory] %>/rails/app/assets/images/favicon.ico
+<% end -%>
+ SetEnv SECRET_KEY_BASE <%= @secret_key_base %>
+ 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
@@ -156,7 +174,7 @@
# Allow all proxy requests
#
- Allow from all
+ Require all granted
#
@@ -191,14 +209,12 @@
#
ProxySet lbmethod=bybusyness
+<% node[:web][:backends].each do |backend| -%>
<% if port == 443 -%>
- BalancerMember https://rails1
- BalancerMember https://rails2
- BalancerMember https://rails3
+ BalancerMember https://<%= backend %> disablereuse=on
<% else -%>
- BalancerMember http://rails1
- BalancerMember http://rails2
- BalancerMember http://rails3
+ BalancerMember http://<%= backend %>
+<% end -%>
<% end -%>
<% if port == 80 -%>
@@ -228,12 +244,6 @@
RewriteRule ^(.*)$ http://www.openstreetmap.org$1 [L,NE,R=permanent]
<% elsif port == 443 -%>
- #
- # Redirect requests which don't work over https to http
- #
- RewriteCond %{REQUEST_URI} ^/edit$
- RewriteRule ^(.*)$ http://www.openstreetmap.org$1 [L,NE,R=permanent]
-
#
# Redirect api requests made to www.osm.org to api.osm.org
#
@@ -281,6 +291,8 @@
ServerAlias maps.open-maps.org mapz.open-maps.org
ServerAlias open-maps.com www.open-maps.com
ServerAlias maps.open-maps.com mapz.open-maps.com
+ ServerAlias osmbugs.org www.osmbugs.org
+ ServerAlias maps.osmbugs.org mapz.osmbugs.org
#Third Party Sites
ServerAlias openstreetmap.pm www.openstreetmap.pm
@@ -306,3 +318,27 @@
RedirectPermanent /events.ics http://calendar.openstreetmap.org.uk/events.ics
RedirectPermanent / http://www.openstreetmap.org/
+
+/rails/public>
+ Require all granted
+
+
+
+ Require all granted
+
+
+
+ Require all granted
+
+
+
+ Require all granted
+
+
+
+ Require all granted
+
+
+
+ Require all granted
+