nominatim: fix slave list

diff --git a/cookbooks/nominatim/recipes/master.rb b/cookbooks/nominatim/recipes/master.rb
index a3200312bc787aaaabdf47d2cd57ef083b3934ea..96117a44014a5369312acd63c243b3a7c2f5e3ea 100644 (file)
--- 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]
 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
 
 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 202240e3f210b85ca5ebe514a8b9dbde230a59ca..92b731a986a6a2f2dafb9a56b8efd334521a7690 100644 (file)
--- 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
 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
   if [[ "$?" != "0" ]]; then
     oldest=0
     break