From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 7 Jan 2016 19:26:33 +0000 (+0100)
Subject: move nominatim traffic back to poldi
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/57d0f5d223f73afe50e6bf82baab8f048a001b65

move nominatim traffic back to poldi
---

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 -%>
 
diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index eb433208a..d7ae5cd6b 100644
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -50,7 +50,7 @@ default_attributes(
       }
     },
     :redirects => {
-      :reverse => "dulcy.openstreetmap.org"
+      :reverse => "poldi.openstreetmap.org"
     }
   },
   :hardware => {