X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/82b50eda860cacb73ec72233394cf7cd0bb6bfa5..2443cfc7684f070dac2dd89772db3a3db5e50a78:/cookbooks/web/templates/default/apache.backend.erb?ds=sidebyside diff --git a/cookbooks/web/templates/default/apache.backend.erb b/cookbooks/web/templates/default/apache.backend.erb index 3f00b2ac6..8a8bb3fa1 100644 --- a/cookbooks/web/templates/default/apache.backend.erb +++ b/cookbooks/web/templates/default/apache.backend.erb @@ -14,6 +14,8 @@ # Enable SSL # SSLEngine on + SSLCertificateFile /etc/ssl/certs/www.openstreetmap.org.pem + SSLCertificateKeyFile /etc/ssl/private/www.openstreetmap.org.key <% end -%> # @@ -52,15 +54,25 @@ # RemoteIPHeader X-Forwarded-For RemoteIPTrustedProxy 146.179.159.160/27 + RemoteIPTrustedProxy 10.0.32.0/24 + + # + # Pass authentication related headers to cgimap + # + + CGIPassAuth On + # # Pass supported calls to cgimap # 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/(node|way|relation)/[0-9]+/history$ 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] + RewriteRule ^/api/0\.6/changeset/[0-9]+/download$ fcgi://127.0.0.1:8000$0 [P] <% end -%>