From: Sarah Hoffmann Date: Thu, 20 Aug 2015 19:21:10 +0000 (+0200) Subject: nominatim: only redirect traffic for www pool X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/2519cd3bff44732d419dbbf53bc99b1e67aa7c4a?hp=aff3fbe6802d93a8deae8fa2637589c8d28f6681 nominatim: only redirect traffic for www pool --- diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb index d14a5c8ed..517967f09 100644 --- a/cookbooks/nominatim/templates/default/apache.erb +++ b/cookbooks/nominatim/templates/default/apache.erb @@ -33,9 +33,11 @@ <% @pools.each do |name,details| -%> Alias /pool-<%= name %>/ "<%= @directory %>/website/" + <% end -%> <% node[:nominatim][:redirects].each do |url,host| -%> - ProxyPassMatch ^/pool-<%= name %>/(<%= url %>\.php(/.*)?) http<% if port == 443 -%>s<% end -%>://<%= host %>/pool-<%= name %>/$1 + ProxyPassMatch ^/pool-www/(<%= url %>\.php(/.*)?) http<% if port == 443 -%>s<% end -%>://<%= host %>/pool-www/$1 <% end -%> + <% @pools.each do |name,details| -%> ProxyPassMatch ^/pool-<%= name %>/(.*\.php(/.*)?) fcgi://127.0.0.1:<%= details[:port ]%><%= @directory %>/website/$1 <% end -%>