Merge remote-tracking branch 'github/pull/464'

[chef.git] / cookbooks / osmosis / recipes / default.rb

diff --git a/cookbooks/osmosis/recipes/default.rb b/cookbooks/osmosis/recipes/default.rb
index 6896fcd209d37e98e82ab9096b7fb8dc08f39e5e..b5b0b60b60a650c3ca8d5328ab16cc711daf3a86 100644 (file)
--- a/cookbooks/osmosis/recipes/default.rb
+++ b/cookbooks/osmosis/recipes/default.rb
@@ -19,13 +19,13 @@
 
 include_recipe "chef"
 
 
 include_recipe "chef"
 

-package "unzip"

 package "default-jre"
 
 cache_dir = Chef::Config[:file_cache_path]
 
 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}"
 
 Dir.glob("#{cache_dir}/osmosis-*.zip").each do |zip|
   next if zip == "#{cache_dir}/#{osmosis_package}"


@@ -39,25 +39,25 @@ end
 directory osmosis_directory do
   owner "root"
   group "root"
 directory osmosis_directory do
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 remote_file "#{cache_dir}/#{osmosis_package}" do
   action :create_if_missing
 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"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

   backup false
 end
 
   backup false
 end
 

-execute "#{cache_dir}/#{osmosis_package}" do
+archive_file "#{cache_dir}/#{osmosis_package}" do

   action :nothing
   action :nothing

-  command "unzip -q #{cache_dir}/#{osmosis_package}"
-  cwd osmosis_directory
-  user "root"
+  destination osmosis_directory
+  overwrite true
+  owner "root"

   group "root"
   group "root"

-  subscribes :run, "execute[#{cache_dir}/#{osmosis_package}]"
+  subscribes :extract, "remote_file[#{cache_dir}/#{osmosis_package}]"

 end
 
 link "/usr/local/bin/osmosis" do
 end
 
 link "/usr/local/bin/osmosis" do