Ignore .kitchen.local.yml

[chef.git] / cookbooks / nominatim / templates / default / updater.erb

diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb
index 2c553ad21372ea0640a767493e63ccd19f65ce95..d8c9666ced65778455c0f0605fe96bc956f47e1f 100644 (file)
--- a/cookbooks/nominatim/templates/default/updater.erb
+++ b/cookbooks/nominatim/templates/default/updater.erb
@@ -2,26 +2,29 @@
 
 # DO NOT EDIT - This file is being maintained by Chef
 
 
 # DO NOT EDIT - This file is being maintained by Chef
 

-# Send output to the log
-exec > /var/log/nominatim/update.log 2>&1
-

 # Change to Nominatim directory
 DIR="$( cd "$( dirname "$0" )" && pwd )"
 cd $DIR/..
 
 # Change to Nominatim directory
 DIR="$( cd "$( dirname "$0" )" && pwd )"
 cd $DIR/..
 

-while true
+while [ ! -f "<%= @update_stop_file %>" ]

 do
 do

+    # Send output to the log (logrotatable)
+    exec >> <%= node[:nominatim][:logdir] %>/update.log 2>&1

     starttime=`date +%s`
 
     ./utils/update.php --no-npi --import-osmosis
 
     starttime=`date +%s`
 
     ./utils/update.php --no-npi --import-osmosis
 

-    # will trigger recompilation if necessary
-    git pull
+    if git fetch origin; then
+      # will trigger recompilation if necessary
+      git merge origin/master
+    else
+      echo "WARNING: git fetch failed."
+    fi

 
     # sleep a bit if updates take less than a minute
     endtime=`date +%s`
     elapsed=$((endtime - starttime))
 
     # sleep a bit if updates take less than a minute
     endtime=`date +%s`
     elapsed=$((endtime - starttime))

-    if [[ $elapsed < 60 ]]
+    if [[ $elapsed -lt 60 ]]

     then
         sleepy=$((60 - $elapsed))
         echo "Sleeping for ${sleepy}s..."
     then
         sleepy=$((60 - $elapsed))
         echo "Sleeping for ${sleepy}s..."