From a19f614c86504b80dd424b5cbca80d55806e00d1 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Wed, 18 Nov 2015 14:26:17 +0100 Subject: [PATCH] nominatim: fix erb syntax --- 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 96117a440..a3200312b 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['name'] }.join(' ') +slaves = search(:node, 'role:nominatim-slave').map{ |result| result[:fqdn] }.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 92b731a98..2930e151d 100644 --- a/cookbooks/nominatim/templates/default/clean-db-nominatim.erb +++ b/cookbooks/nominatim/templates/default/clean-db-nominatim.erb @@ -15,7 +15,7 @@ done # Cleanup archive directory oldest=`date +%s` -for fl in <% @streaming_clients %>; do +for fl in <%= @streaming_clients %>; do lastupdate=`wget -O - -q http://${fl}.openstreetmap.org/last_update.php` if [[ "$?" != "0" ]]; then oldest=0 -- 2.43.2