X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/aeaa46f3071de018b5c5e0f5678cb5b4082e3ddc..HEAD:/cookbooks/osmosis/recipes/default.rb diff --git a/cookbooks/osmosis/recipes/default.rb b/cookbooks/osmosis/recipes/default.rb index ff38e90e0..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] @@ -52,13 +49,13 @@ remote_file "#{cache_dir}/#{osmosis_package}" do 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