nominatim: add apache headers module for blocking headers

[chef.git] / cookbooks / nominatim / recipes / master.rb

diff --git a/cookbooks/nominatim/recipes/master.rb b/cookbooks/nominatim/recipes/master.rb
index a3200312bc787aaaabdf47d2cd57ef083b3934ea..b135022b8e4cf625b1dc7472e78b347751776786 100644 (file)
--- 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
@@ -59,7 +60,7 @@ end
 directory wal_archives do
   owner "postgres"
   group "postgres"
-  mode 0700
+  mode 0o700
   only_if { node[:postgresql][:settings][:defaults][:archive_mode] == "on" }
 end
 
@@ -67,11 +68,9 @@ template "/usr/local/bin/clean-db-nominatim" do
   source "clean-db-nominatim.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
   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
-
-