From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 18 Nov 2015 13:31:37 +0000 (+0100)
Subject: nominatim: resort to static slave list
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/d8f0d37b92d57e4a1bf8c03dc8884a829ac0c815?hp=a19f614c86504b80dd424b5cbca80d55806e00d1

nominatim: resort to static slave list
---

diff --git a/cookbooks/nominatim/recipes/master.rb b/cookbooks/nominatim/recipes/master.rb
index a3200312b..0d93ad720 100644
--- a/cookbooks/nominatim/recipes/master.rb
+++ b/cookbooks/nominatim/recipes/master.rb
@@ -24,7 +24,8 @@ 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(' ')
+# XXX we really should get a list of nominatim-slave nodes here
+slaves = 'poldi'
 
 git "#{home_directory}/nominatim" do
   action :checkout
@@ -69,7 +70,7 @@ template "/usr/local/bin/clean-db-nominatim" do
   group "root"
   mode 0755
   variables :archive_dir => wal_archives,
-            :update_stop_file => "{home_directory}/status/updates_disabled",
+            :update_stop_file => "#{home_directory}/status/updates_disabled",
             :streaming_clients => slaves
   only_if { node[:postgresql][:settings][:defaults][:archive_mode] == "on" }
 end