From 04e94420600411b12cb99221714da36aae5634bf Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Thu, 18 Jun 2015 23:14:17 +0200 Subject: [PATCH] redirect reverse geocoding traffic to poldi --- cookbooks/nominatim/recipes/base.rb | 1 + cookbooks/nominatim/templates/default/apache.erb | 3 +++ roles/pummelzacken.rb | 3 +++ 3 files changed, 7 insertions(+) diff --git a/cookbooks/nominatim/recipes/base.rb b/cookbooks/nominatim/recipes/base.rb index 9dd0f1c1f..69b5db1ae 100644 --- a/cookbooks/nominatim/recipes/base.rb +++ b/cookbooks/nominatim/recipes/base.rb @@ -31,6 +31,7 @@ package "php-apc" apache_module "rewrite" apache_module "proxy" apache_module "proxy_fcgi" +apache_module "proxy_http" home_directory = data_bag_item("accounts", "nominatim")["home"] source_directory = "#{home_directory}/nominatim" diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb index 230063643..fb6acc76c 100644 --- a/cookbooks/nominatim/templates/default/apache.erb +++ b/cookbooks/nominatim/templates/default/apache.erb @@ -32,6 +32,9 @@ <% @pools.each do |name,details| -%> Alias /pool-<%= name %>/ "<%= @directory %>/website/" + <% node[:nominatim][:redirects].each do |url,host| -%> + ProxyPassMatch ^/pool-<%= name %>/(<%= url %>\.php(/.*)?) http<%= if port == 443 %>s<%= end %>://<%= host %>/pool-<%= name %>/$1 + <% end -%> 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 68eaefb13..df54c29ec 100644 --- a/roles/pummelzacken.rb +++ b/roles/pummelzacken.rb @@ -49,6 +49,9 @@ default_attributes( :pm => "static", :max_children => "10" } + }, + :redirects => { + :reverse => "poldi.openstreetmap.org" } } ) -- 2.43.2