X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0f9b10e62eb9048bfcfa512500adb865ebc1ea79..e92ed5e09215d67f2bd7dc21a32425d7ec5aa26f:/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 22cfe642e..40367de17 100644 --- 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 " + echo "Usage: overpass-import-db " 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