From b25b96fb7ba845165a157faa87ed39a425a10d80 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Wed, 6 Jan 2016 14:52:03 +0100 Subject: [PATCH] Revert "nominatim: only redirect traffic for www pool" This reverts commit 2519cd3bff44732d419dbbf53bc99b1e67aa7c4a. --- cookbooks/nominatim/templates/default/apache.erb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb index 517967f09..d14a5c8ed 100644 --- a/cookbooks/nominatim/templates/default/apache.erb +++ b/cookbooks/nominatim/templates/default/apache.erb @@ -33,11 +33,9 @@ <% @pools.each do |name,details| -%> Alias /pool-<%= name %>/ "<%= @directory %>/website/" - <% end -%> <% node[:nominatim][:redirects].each do |url,host| -%> - ProxyPassMatch ^/pool-www/(<%= url %>\.php(/.*)?) http<% if port == 443 -%>s<% end -%>://<%= host %>/pool-www/$1 + ProxyPassMatch ^/pool-<%= name %>/(<%= url %>\.php(/.*)?) http<% if port == 443 -%>s<% end -%>://<%= host %>/pool-<%= name %>/$1 <% end -%> - <% @pools.each do |name,details| -%> ProxyPassMatch ^/pool-<%= name %>/(.*\.php(/.*)?) fcgi://127.0.0.1:<%= details[:port ]%><%= @directory %>/website/$1 <% end -%> -- 2.43.2