move nominatim traffic to dulcy

diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb
index 517967f09fbc126daa8e1ce2ba459bf36576879c..d14a5c8edfe372ad12c33323f57b944ef2c68471 100644 (file)
--- 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 -%>
 

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index d7ae5cd6bbba3c6d9a63b775394aca2e4a5674f7..f1da8d67e39df65c69907bccc8872a11481a746e 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -50,7 +50,9 @@ default_attributes(
       }
     },
     :redirects => {
-      :reverse => "poldi.openstreetmap.org"
+      :reverse => "dulcy.openstreetmap.org",
+      :search => "dulcy.openstreetmap.org",
+      :details => "dulcy.openstreetmap.org"
     }
   },
   :hardware => {