X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/58513ca6865fbbd1849fb128f4b153a59b6f93ea..8ccf941a82940d016e9c68bdf0c29e190953c7f7:/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 6690a255e..9fbb7919d 100644
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -12,7 +12,6 @@
# Enable SSL
#
SSLEngine on
- SSLProxyEngine on
SSLCertificateFile /etc/ssl/certs/www.openstreetmap.org.pem
SSLCertificateKeyFile /etc/ssl/private/www.openstreetmap.org.key
@@ -74,6 +73,13 @@
#
RewriteRule ^/api/0.6/changeset/6823497/download$ - [F,L]
+ #
+ # Ignore Vicon Valerus "online" status pings
+ # https://gist.github.com/Firefishy/86ed5b86991b225179b54bbafbcd769e
+ #
+ RewriteCond "%{QUERY_STRING}" "^q=abcde&t=20"
+ RewriteRule "^/api/0\.6/notes/search$" - [R=204,L]
+
#
# Force special MIME type for crossdomain.xml files
#
@@ -138,38 +144,24 @@
Alias /attachments /store/rails/attachments
#
- # Preserve the host name when forwarding to the proxy
- #
- ProxyPreserveHost on
-
- #
- # Set a long timeout - changeset uploads can take a long time
+ # Pass authentication related headers to cgimap
#
- ProxyTimeout 3600
-
- #
- # Allow all proxy requests
- #
-
- Require all granted
-
+
+ CGIPassAuth On
+
#
- # Pass some other API calls to the backends via a load balancer
+ # Pass supported calls to cgimap
#
- ProxyPassMatch ^(/api/0\.6/map(\.json|\.xml)?)$ balancer://backend$1
- ProxyPassMatch ^(/api/0\.6/tracepoints)$ balancer://backend$1
- ProxyPassMatch ^(/api/0\.6/amf/read)$ balancer://backend$1
- ProxyPassMatch ^(/api/0\.6/swf/trackpoints)$ balancer://backend$1
- ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+(\.json|\.xml)?)$ balancer://backend$1
- ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/upload(\.json|\.xml)?)$ balancer://amsterdam$1
- ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/download(\.json|\.xml)?)$ balancer://backend$1
- ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+(\.json|\.xml)?)$ balancer://backend$1
- ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+/(full|history|search|ways|relations)(\.json|\.xml)?)$ balancer://backend$1
- ProxyPassMatch ^(/api/0\.6/nodes(\.json|\.xml)?)$ balancer://backend$1
- ProxyPassMatch ^(/api/0\.6/ways(\.json|\.xml)?)$ balancer://backend$1
- ProxyPassMatch ^(/api/0\.6/relations(\.json|\.xml)?)$ balancer://backend$1
- ProxyPassMatch ^(/trace/[0-9]+/data(|/|.xml))$ balancer://backend$1
+ RewriteRule ^/api/0\.6/map(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]
+ RewriteCond %{REQUEST_METHOD} ^(HEAD|GET)$
+ RewriteRule ^/api/0\.6/(node|way|relation|changeset)/[0-9]+(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]
+ RewriteRule ^/api/0\.6/(node|way|relation)/[0-9]+/history(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]
+ RewriteRule ^/api/0\.6/(node|way|relation)/[0-9]+/relations(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]
+ RewriteRule ^/api/0\.6/node/[0-9]+/ways(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]
+ RewriteRule ^/api/0\.6/(way|relation)/[0-9]+/full(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]
+ RewriteRule ^/api/0\.6/(nodes|ways|relations)(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]
+ RewriteRule ^/api/0\.6/changeset/[0-9]+/(upload|download)(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P]
#
# Redirect trac and wiki requests to the right places
@@ -183,36 +175,6 @@
RedirectPermanent /images/osm_logo.png https://www.openstreetmap.org/assets/osm_logo.png
RedirectPermanent /images/cc_button.png https://www.openstreetmap.org/assets/cc_button.png
- #
- # Define a load balancer for the local backends
- #
-
- ProxySet lbmethod=bybusyness
-<% Array(node[:web][:backends]).each do |backend| -%>
- BalancerMember https://<%= backend %> disablereuse=on
-<% end -%>
-
-
- #
- # Define a load balancer for the Amsterdam backends
- #
-
- ProxySet lbmethod=bybusyness
-<% ["rails1.ams", "rails2.ams", "rails3.ams"].each do |backend| -%>
- BalancerMember https://<%= backend %> disablereuse=on
-<% end -%>
-
-
- #
- # Define a load balancer for the Bytemark backends
- #
-
- ProxySet lbmethod=bybusyness
-<% ["rails4.bm", "rails5.bm"].each do |backend| -%>
- BalancerMember https://<%= backend %> disablereuse=on
-<% end -%>
-
-
#
# Redirect api requests made to www.osm.org to api.osm.org
#
@@ -300,6 +262,10 @@
+
+ Require all granted
+
+
Require all granted