From 1dc14a093d2057651fc68cf465419c970d46f8f4 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 18 Sep 2016 13:36:52 +0200
Subject: [PATCH] nominatim: remove only if with potential uninitialised
 variables

---
 cookbooks/nominatim/recipes/default.rb | 41 +++++++++++++-------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 5b6eec45c..055b87072 100644
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -104,29 +104,28 @@ node[:nominatim][:tablespaces].each do |name, location|
   end
 end
 
-postgresql_user "replication" do
-  cluster node[:nominatim][:dbcluster]
-  password data_bag_item("nominatim", "passwords")["replication"]
-  replication true
-  only_if { node[:nominatim][:state] == "master" }
-end
+if node[:nominatim][:state] == "master" # ~FC023
+  postgresql_user "replication" do
+    cluster node[:nominatim][:dbcluster]
+    password data_bag_item("nominatim", "passwords")["replication"]
+    replication true
+  end
 
-directory node[:rsyncd][:modules][:archive][:path] do
-  owner "postgres"
-  group "postgres"
-  mode 0o700
-  only_if { node[:nominatim][:state] == "master" }
-end
+  directory node[:rsyncd][:modules][:archive][:path] do
+    owner "postgres"
+    group "postgres"
+    mode 0o700
+  end
 
-template "/usr/local/bin/clean-db-nominatim" do
-  source "clean-db-nominatim.erb"
-  owner "root"
-  group "root"
-  mode 0o755
-  variables :archive_dir => node[:rsyncd][:modules][:archive][:path],
-            :update_stop_file => "#{basedir}/status/updates_disabled",
-            :streaming_clients => search(:node, "nominatim_state:slave").map { |slave| slave[:fdqn] }.join(" ")
-  only_if { node[:nominatim][:state] == "master" }
+  template "/usr/local/bin/clean-db-nominatim" do
+    source "clean-db-nominatim.erb"
+    owner "root"
+    group "root"
+    mode 0o755
+    variables :archive_dir => node[:rsyncd][:modules][:archive][:path],
+              :update_stop_file => "#{basedir}/status/updates_disabled",
+              :streaming_clients => search(:node, "nominatim_state:slave").map { |slave| slave[:fdqn] }.join(" ")
+  end
 end
 
 ## Nominatim backend
-- 
2.39.5