From f0eca44316766bde8aa519d9a856999adfc2d0fb Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 12 Oct 2016 10:44:23 +0100 Subject: [PATCH 1/1] Send /api/0.6/changeset/NNN to cgimap --- cookbooks/web/templates/default/apache.backend.erb | 2 +- cookbooks/web/templates/default/apache.frontend.erb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cookbooks/web/templates/default/apache.backend.erb b/cookbooks/web/templates/default/apache.backend.erb index aed339f4f..5ec7c78c6 100644 --- a/cookbooks/web/templates/default/apache.backend.erb +++ b/cookbooks/web/templates/default/apache.backend.erb @@ -66,7 +66,7 @@ # RewriteRule ^/api/0\.6/map$ fcgi://127.0.0.1:8000$0 [P] RewriteCond %{REQUEST_METHOD} ^(HEAD|GET)$ - RewriteRule ^/api/0\.6/(node|way|relation)/[0-9]+$ fcgi://127.0.0.1:8000$0 [P] + RewriteRule ^/api/0\.6/(node|way|relation|changeset)/[0-9]+$ fcgi://127.0.0.1:8000$0 [P] RewriteRule ^/api/0\.6/(way|relation)/[0-9]+/full$ fcgi://127.0.0.1:8000$0 [P] RewriteRule ^/api/0\.6/(nodes|ways|relations)$ fcgi://127.0.0.1:8000$0 [P] diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb index ad5158d5e..526ec8dd7 100644 --- a/cookbooks/web/templates/default/apache.frontend.erb +++ b/cookbooks/web/templates/default/apache.frontend.erb @@ -189,6 +189,7 @@ 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]+)$ balancer://backend$1 ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/upload)$ balancer://bytemark$1 ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/download)$ balancer://backend$1 ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+)$ balancer://backend$1 -- 2.43.2