From 719d5e33dbd0c8aed11e5260d7784a2b613699bd Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Wed, 18 Nov 2015 14:20:38 +0100 Subject: [PATCH] nominatim: fix slave list --- cookbooks/nominatim/recipes/master.rb | 2 +- cookbooks/nominatim/templates/default/clean-db-nominatim.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cookbooks/nominatim/recipes/master.rb b/cookbooks/nominatim/recipes/master.rb index a3200312b..96117a440 100644 --- a/cookbooks/nominatim/recipes/master.rb +++ b/cookbooks/nominatim/recipes/master.rb @@ -24,7 +24,7 @@ database_cluster = node[:nominatim][:database][:cluster] home_directory = data_bag_item("accounts", "nominatim")["home"] wal_archives = node[:rsyncd][:modules][:archive][:path] -slaves = search(:node, 'role:nominatim-slave').map{ |result| result[:fqdn] }.join(' ') +slaves = search(:node, 'role:nominatim-slave').map{ |result| result['name'] }.join(' ') git "#{home_directory}/nominatim" do action :checkout diff --git a/cookbooks/nominatim/templates/default/clean-db-nominatim.erb b/cookbooks/nominatim/templates/default/clean-db-nominatim.erb index 202240e3f..92b731a98 100644 --- a/cookbooks/nominatim/templates/default/clean-db-nominatim.erb +++ b/cookbooks/nominatim/templates/default/clean-db-nominatim.erb @@ -16,7 +16,7 @@ done oldest=`date +%s` for fl in <% @streaming_clients %>; do - lastupdate=`wget -O - -q http://$fl/last_update.php` + lastupdate=`wget -O - -q http://${fl}.openstreetmap.org/last_update.php` if [[ "$?" != "0" ]]; then oldest=0 break -- 2.39.5