From a2b86e1616a830f61beea7cb21fef79974c52875 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Thu, 14 Jan 2016 16:20:59 +0100 Subject: [PATCH 1/1] move nominatim traffic to dulcy --- cookbooks/nominatim/templates/default/apache.erb | 4 +--- roles/pummelzacken.rb | 4 +++- 2 files changed, 4 insertions(+), 4 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 -%> diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb index d7ae5cd6b..f1da8d67e 100644 --- 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 => { -- 2.45.1