X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/4e6e1284f19701f46df4abec8d988d6682909474..93b82f6239bf810ecdb96241c7680628f5a7ebc9:/cookbooks/dev/templates/default/apache.rails.erb?ds=sidebyside diff --git a/cookbooks/dev/templates/default/apache.rails.erb b/cookbooks/dev/templates/default/apache.rails.erb index c8f5f779d..cf2a56613 100644 --- a/cookbooks/dev/templates/default/apache.rails.erb +++ b/cookbooks/dev/templates/default/apache.rails.erb @@ -14,7 +14,7 @@ CustomLog /var/log/apache2/<%= @name %>-access.log combined ErrorLog /var/log/apache2/<%= @name %>-error.log - DocumentRoot /srv/<%= @name %>/public + DocumentRoot /srv/<%= @name %>/rails/public RailsEnv production PassengerAppGroupName <%= @application_name %> @@ -29,6 +29,28 @@ ForceType text/x-cross-domain-policy +<% if @cgimap_enabled -%> + + # Pass authentication related headers to cgimap + + CGIPassAuth On + + + # Set a long timeout for proxying to cgimap + ProxyTimeout 3600 + + # Pass supported calls to cgimap + RewriteEngine on + RewriteRule ^/api/0\.6/map(\.json|\.xml)?$ fcgi://127.0.0.1:<%= @cgimap_port %>$0 [P] + RewriteCond %{REQUEST_METHOD} ^(HEAD|GET)$ + RewriteRule ^/api/0\.6/(node|way|relation|changeset)/[0-9]+(\.json|\.xml)?$ fcgi://127.0.0.1:<%= @cgimap_port %>$0 [P] + RewriteRule ^/api/0\.6/(node|way|relation)/[0-9]+/history(\.json|\.xml)?$ fcgi://127.0.0.1:<%= @cgimap_port %>$0 [P] + RewriteRule ^/api/0\.6/(node|way|relation)/[0-9]+/relations(\.json|\.xml)?$ fcgi://127.0.0.1:<%= @cgimap_port %>$0 [P] + RewriteRule ^/api/0\.6/node/[0-9]+/ways(\.json|\.xml)?$ fcgi://127.0.0.1:<%= @cgimap_port %>$0 [P] + RewriteRule ^/api/0\.6/(way|relation)/[0-9]+/full(\.json|\.xml)?$ fcgi://127.0.0.1:<%= @cgimap_port %>$0 [P] + RewriteRule ^/api/0\.6/(nodes|ways|relations)(\.json|\.xml)?$ fcgi://127.0.0.1:<%= @cgimap_port %>$0 [P] + RewriteRule ^/api/0\.6/changeset/[0-9]+/(upload|download)(\.json|\.xml)?$ fcgi://127.0.0.1:<%= @cgimap_port %>$0 [P] +<% end -%> @@ -49,14 +71,14 @@ Header set X-Robots-Tag "noindex, nofollow" -/public> +/rails/public> Require all granted -/app/assets> +/rails/app/assets> Require all granted -/vendor/assets> +/rails/vendor/assets> Require all granted