X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/10f2e80eb265e70fe86667ef94463f1209259408..31f1fa863c0b208a44e10ef3ae1571024ef0f0ae:/cookbooks/osmosis/recipes/default.rb

diff --git a/cookbooks/osmosis/recipes/default.rb b/cookbooks/osmosis/recipes/default.rb
index 4160a9b40..40f0be590 100644
--- a/cookbooks/osmosis/recipes/default.rb
+++ b/cookbooks/osmosis/recipes/default.rb
@@ -17,9 +17,6 @@
 # limitations under the License.
 #
 
-include_recipe "chef"
-
-package "unzip"
 package "default-jre"
 
 cache_dir = Chef::Config[:file_cache_path]
@@ -40,7 +37,7 @@ end
 directory osmosis_directory do
   owner "root"
   group "root"
-  mode 0o755
+  mode "755"
 end
 
 remote_file "#{cache_dir}/#{osmosis_package}" do
@@ -48,17 +45,17 @@ remote_file "#{cache_dir}/#{osmosis_package}" do
   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
 
-execute "#{cache_dir}/#{osmosis_package}" do
+archive_file "#{cache_dir}/#{osmosis_package}" do
   action :nothing
-  command "unzip -q #{cache_dir}/#{osmosis_package}"
-  cwd osmosis_directory
-  user "root"
+  destination osmosis_directory
+  overwrite true
+  owner "root"
   group "root"
-  subscribes :run, "remote_file[#{cache_dir}/#{osmosis_package}]"
+  subscribes :extract, "remote_file[#{cache_dir}/#{osmosis_package}]"
 end
 
 link "/usr/local/bin/osmosis" do