Merge remote-tracking branch 'github/pull/704'

[chef.git] / cookbooks / overpass / templates / default / overpass-import-db.erb

diff --git a/cookbooks/overpass/templates/default/overpass-import-db.erb b/cookbooks/overpass/templates/default/overpass-import-db.erb
index 22cfe642e512fe6a583e5ccf89c0e44ec651f1c2..40367de170a00b564fda86b910bb824a23324f11 100644 (file)
--- a/cookbooks/overpass/templates/default/overpass-import-db.erb
+++ b/cookbooks/overpass/templates/default/overpass-import-db.erb
@@ -3,7 +3,7 @@
 FNAME=$1
 
 if [[ "x$FNAME" == "x" ]]; then
-  echo "Usage: overpass-import-db.sh <OSM file>"
+  echo "Usage: overpass-import-db <OSM file>"
   exit 1
 fi
 
@@ -21,10 +21,10 @@ META=--keep-attic
 META=
 <% end -%>
 
-sudo systemctl stop overpass-area-processor.timer
-sudo systemctl stop overpass-update
-sudo systemctl stop overpass-area-dispatcher
-sudo systemctl stop overpass-dispatcher
+sudo systemctl stop overpass-area-processor || true
+sudo systemctl stop overpass-update || true
+sudo systemctl stop overpass-area-dispatcher || true
+sudo systemctl stop overpass-dispatcher || true
 
 sleep 2
 
@@ -40,7 +40,7 @@ echo "Import finished. Catching up with new changes."
 sudo systemctl start overpass-dispatcher
 sudo systemctl start overpass-area-dispatcher
 
-PYOSMIUM="sudo -u <%= @username %> pyosmium-get-changes --server <%= node[:overpass][:replication_url] %> -f <%= @basedir %>/db/replicate-id"
+PYOSMIUM="sudo -u <%= @username %> pyosmium-get-changes --server <%= node[:overpass][:replication_url] %> --diff-type osc.gz -f <%= @basedir %>/db/replicate-id"
 <% if node[:overpass][:meta_mode] == "attic" -%>
 PYOSMIUM="$PYOSMIUM --no-deduplicate"
 <% end -%>
@@ -70,5 +70,3 @@ echo "DB up-to-date. Processing areas."
 sudo -u <%= @username %> <%= @basedir %>/bin/osm3s_query --progress --rules <<%= @srcdir %>/rules/areas.osm3s
 
 echo "All updates done."
-
-sudo systemctl start overpass-area-processor.timer