nominatim: run updates from build dir

diff --git a/cookbooks/nominatim/recipes/base.rb b/cookbooks/nominatim/recipes/base.rb
index 7a473b9cce2a5d604e5315955cffed9be100f742..9a3252c72e54f63f94255378e99ae4d8f6045f99 100644 (file)
--- a/cookbooks/nominatim/recipes/base.rb
+++ b/cookbooks/nominatim/recipes/base.rb
@@ -195,7 +195,8 @@ template "#{source_directory}/utils/nominatim-update" do
   user "nominatim"
   group "nominatim"
   mode 0o755
-  variables :logfile => "#{node[:nominatim][:logdir]}/update.log",
+  variables :bindir => source_directory,
+            :logfile => "#{node[:nominatim][:logdir]}/update.log",
             :branch => node[:nominatim][:revision],
             :update_stop_file => "#{home_directory}/status/updates_disabled"
 end

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 00bfb2715900da39225fcc5c5af7ff1e86697f4e..2e5887b5ae4564a2e4f504f2399404f1f7b668b2 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -243,7 +243,8 @@ template "#{source_directory}/utils/nominatim-update" do
   user "nominatim"
   group "nominatim"
   mode 0o755
-  variables :logfile => "#{node[:nominatim][:logdir]}/update.log",
+  variables :bindir => build_directory,
+            :logfile => "#{node[:nominatim][:logdir]}/update.log",
             :branch => node[:nominatim][:revision],
             :update_stop_file => "#{basedir}/status/updates_disabled"
 end

diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb
index b259c4ed687dd86e56595493c2a60824273f1d91..5c5a4448b5f6898e7ca99e628d24bb8abbd18d1d 100644 (file)
--- a/cookbooks/nominatim/templates/default/updater.erb
+++ b/cookbooks/nominatim/templates/default/updater.erb
@@ -3,8 +3,7 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 # Change to Nominatim directory
-DIR="$( cd "$( dirname "$0" )" && pwd )"
-cd $DIR/..
+cd <%= @bindir %>
 
 while [ ! -f "<%= @update_stop_file %>" ]
 do