overpass: update to newest version

Also avoid failing import script when systemd scripts not yet enabled.

diff --git a/cookbooks/overpass/attributes/default.rb b/cookbooks/overpass/attributes/default.rb
index ed2d82ad8cdf879963901507e9b947155c90f4e3..3bf067f26ab477807240213878cac6296858dc4a 100644 (file)
--- a/cookbooks/overpass/attributes/default.rb
+++ b/cookbooks/overpass/attributes/default.rb
@@ -1,5 +1,5 @@
 default[:overpass][:fqdn] = "overpass.openstreetmap.org"
-default[:overpass][:version] = "0.7.59.1"
+default[:overpass][:version] = "0.7.61.8"
 # One of: no, meta, attic
 default[:overpass][:meta_mode] = "attic"
 # One of: no, gz, lz4

diff --git a/cookbooks/overpass/templates/default/overpass-import-db.erb b/cookbooks/overpass/templates/default/overpass-import-db.erb
index 22cfe642e512fe6a583e5ccf89c0e44ec651f1c2..44be6e2bb0f7f17fe05a765da864f8bbd6ed1ed7 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.timer || true
+sudo systemctl stop overpass-update || true
+sudo systemctl stop overpass-area-dispatcher || true
+sudo systemctl stop overpass-dispatcher || true
 
 sleep 2