X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/9949b7666e55675ff8e962fc7c44140b80b21125..e41ce8527c0cc0e9a9984a8459cbd3dd508bdda3:/cookbooks/osmosis/recipes/default.rb diff --git a/cookbooks/osmosis/recipes/default.rb b/cookbooks/osmosis/recipes/default.rb index 6896fcd20..ff38e90e0 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}" @@ -39,15 +40,15 @@ end directory osmosis_directory do owner "root" group "root" - mode 0o755 + mode "755" 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 + mode "644" backup false end @@ -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