nominatim: replace node references in templates with variables

diff --git a/cookbooks/nominatim/recipes/base.rb b/cookbooks/nominatim/recipes/base.rb
index 76813c346f5dabf6c52e13a349d26b9f4331d45d..97cf576c6f4050e3070b5c6b5b9948eb22603441 100644 (file)
--- a/cookbooks/nominatim/recipes/base.rb
+++ b/cookbooks/nominatim/recipes/base.rb
@@ -207,6 +207,8 @@ end
 
 munin_plugin_conf "nominatim" do
   template "munin.erb"
+  variables :db => node[:nominatim][:database][:dbname],
+            :querylog => "#{node[:nominatim][:logdir]}/query.log"
 end
 
 munin_plugin "nominatim_importlag" do
@@ -249,6 +251,7 @@ additional_scripts.each do |fname|
     owner "root"
     group "root"
     mode 0o755
+    variables :db => node[:nominatim][:database][:dbname]
   end
 end
 

diff --git a/cookbooks/nominatim/templates/default/backup-nominatim.erb b/cookbooks/nominatim/templates/default/backup-nominatim.erb
index 09711cc43de11fee31cab3f8956dea03b4477c52..7cae01b27c43e2d64ffad8a3e8fa204792798dd9 100644 (file)
--- a/cookbooks/nominatim/templates/default/backup-nominatim.erb
+++ b/cookbooks/nominatim/templates/default/backup-nominatim.erb
@@ -12,7 +12,7 @@
 D=`date +%Y-%m-%d`
 F=/tmp/nominatim-${D}.dmp
 
-pg_dump --file=$F -F c -Z 9 -t file -t '*columns' -t 'import_polygon_*' -t import_status -t place_addressline -t placex -t search_name -t 'seq_*' -t word <%= node[:nominatim][:database][:dbname] %>
+pg_dump --file=$F -F c -Z 9 -t file -t '*columns' -t 'import_polygon_*' -t import_status -t place_addressline -t placex -t search_name -t 'seq_*' -t word <%= @db %>
 
 export RSYNC_RSH="ssh -ax"
 rsync $F backup.openstreetmap.org::backup

diff --git a/cookbooks/nominatim/templates/default/munin.erb b/cookbooks/nominatim/templates/default/munin.erb
index aa6ac2af277721f7a695760f7c4776d364c719bd..284314567aa6e3f76ed4b0b4af9e9d09e7e1de22 100644 (file)
--- a/cookbooks/nominatim/templates/default/munin.erb
+++ b/cookbooks/nominatim/templates/default/munin.erb
@@ -2,6 +2,6 @@
 
 [nominatim_*]
 user www-data
-env.PGDATABASE <%= node[:nominatim][:database][:dbname] %>
+env.PGDATABASE <%= @db %>
 env.PGUSER www-data
-env.NOMINATIM_QUERYLOG <%= node[:nominatim][:logdir] %>/query.log
+env.NOMINATIM_QUERYLOG <%= @querylog %>

diff --git a/cookbooks/nominatim/templates/default/vacuum-db-nominatim.erb b/cookbooks/nominatim/templates/default/vacuum-db-nominatim.erb
index 77b1257ef2016f09c72a1169a6d1ed8e4adea3c1..dacdbf631411938312a2f5e55f06ecd935424cb7 100644 (file)
--- a/cookbooks/nominatim/templates/default/vacuum-db-nominatim.erb
+++ b/cookbooks/nominatim/templates/default/vacuum-db-nominatim.erb
@@ -5,10 +5,10 @@
 
 # Vaccum all tables with indices on integer arrays.
 # Agressive vacuuming seems to help against index bloat.
-psql -q -d nominatim -c 'VACUUM ANALYSE search_name'
-psql -q -d nominatim -c 'VACUUM ANALYSE search_name_country'
+psql -q -d <%= @db %> -c 'VACUUM ANALYSE search_name'
+psql -q -d <%= @db %> -c 'VACUUM ANALYSE search_name_country'
 
 for i in `seq 0 246`; do
-  psql -q -d nominatim -c "VACUUM ANALYSE search_name_${i}"
+  psql -q -d <%= @db %> -c "VACUUM ANALYSE search_name_${i}"
 done