From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 4 Mar 2024 14:44:12 +0000 (+0100)
Subject: overpass: update to newest version
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/c91352f2a61adf692af66e3b860d8dba1a06d316

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 ed2d82ad8..3bf067f26 100644
--- 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 22cfe642e..44be6e2bb 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 <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