Handle overpass shipping patch releases

Overpass has patch releases with an extended version
on the directory inside the tar ball.

diff --git a/cookbooks/overpass/attributes/default.rb b/cookbooks/overpass/attributes/default.rb
index ed1d28f970e2cca930289c51520660828212f5dc..0cfd5dabab150f08a34e257ab6e915c7b9ee5b1b 100644 (file)
--- a/cookbooks/overpass/attributes/default.rb
+++ b/cookbooks/overpass/attributes/default.rb
@@ -1,5 +1,6 @@
 default[:overpass][:fqdn] = "overpass.openstreetmap.org"
 default[:overpass][:version] = "0.7.57"
 default[:overpass][:fqdn] = "overpass.openstreetmap.org"
 default[:overpass][:version] = "0.7.57"

+default[:overpass][:full_version] = "0.7.57.2"

 # One of: no, meta, attic
 default[:overpass][:meta_mode] = "attic"
 # One of: no, gz, lz4
 # One of: no, meta, attic
 default[:overpass][:meta_mode] = "attic"
 # One of: no, gz, lz4

diff --git a/cookbooks/overpass/recipes/default.rb b/cookbooks/overpass/recipes/default.rb
index 690a28445102e3c32ababb5731658987ca18d07d..be930135fc24ad9a3470d5118925b8b70d2e19ba 100644 (file)
--- a/cookbooks/overpass/recipes/default.rb
+++ b/cookbooks/overpass/recipes/default.rb
@@ -37,7 +37,7 @@ end
 
 ## Install overpass from source
 
 
 ## Install overpass from source
 

-srcdir = "#{basedir}/src/osm-3s_v#{node[:overpass][:version]}"
+srcdir = "#{basedir}/src/osm-3s_v#{node[:overpass][:full_version]}"

 
 package %w[
   build-essential
 
 package %w[
   build-essential

diff --git a/test/data_bags/accounts/overpass.json b/test/data_bags/accounts/overpass.json
new file mode 100644 (file)
index 0000000..7aa7c2b
--- /dev/null
+++ b/test/data_bags/accounts/overpass.json
@@ -0,0 +1,6 @@
+{
+  "id": "overpass",
+  "uid": "528",
+  "comment": "query.openstreetmap.org",
+  "home": "/srv/query.openstreetmap.org"
+}