From: Tom Hughes <tom@compton.nu>
Date: Sun, 12 Apr 2020 18:47:42 +0000 (+0100)
Subject: Update osmosis to 0.47.4
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/10f2e80eb265e70fe86667ef94463f1209259408

Update osmosis to 0.47.4
---

diff --git a/cookbooks/osmosis/attributes/default.rb b/cookbooks/osmosis/attributes/default.rb
index 8d4f9a3b6..ef4592100 100644
--- a/cookbooks/osmosis/attributes/default.rb
+++ b/cookbooks/osmosis/attributes/default.rb
@@ -1,2 +1,2 @@
 # Set the default version
-default[:osmosis][:version] = "0.43.1"
+default[:osmosis][:version] = "0.47.4"
diff --git a/cookbooks/osmosis/recipes/default.rb b/cookbooks/osmosis/recipes/default.rb
index 6896fcd20..4160a9b40 100644
--- a/cookbooks/osmosis/recipes/default.rb
+++ b/cookbooks/osmosis/recipes/default.rb
@@ -24,8 +24,9 @@ package "default-jre"
 
 cache_dir = Chef::Config[:file_cache_path]
 
-osmosis_package = "osmosis-#{node[:osmosis][:version]}.zip"
-osmosis_directory = "/opt/osmosis-#{node[:osmosis][:version]}"
+osmosis_version = node[:osmosis][:version]
+osmosis_package = "osmosis-#{osmosis_version}.zip"
+osmosis_directory = "/opt/osmosis-#{osmosis_version}"
 
 Dir.glob("#{cache_dir}/osmosis-*.zip").each do |zip|
   next if zip == "#{cache_dir}/#{osmosis_package}"
@@ -44,7 +45,7 @@ end
 
 remote_file "#{cache_dir}/#{osmosis_package}" do
   action :create_if_missing
-  source "https://bretth.dev.openstreetmap.org/osmosis-build/#{osmosis_package}"
+  source "https://github.com/openstreetmap/osmosis/releases/download/#{osmosis_version}/osmosis-#{osmosis_version}.zip"
   owner "root"
   group "root"
   mode 0o644
@@ -57,7 +58,7 @@ execute "#{cache_dir}/#{osmosis_package}" do
   cwd osmosis_directory
   user "root"
   group "root"
-  subscribes :run, "execute[#{cache_dir}/#{osmosis_package}]"
+  subscribes :run, "remote_file[#{cache_dir}/#{osmosis_package}]"
 end
 
 link "/usr/local/bin/osmosis" do