X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/18e12b0e123fc3e5f344682f884feabc12da0f5a..e92ed5e09215d67f2bd7dc21a32425d7ec5aa26f:/cookbooks/osmosis/recipes/default.rb diff --git a/cookbooks/osmosis/recipes/default.rb b/cookbooks/osmosis/recipes/default.rb index 707ebe620..40f0be590 100644 --- a/cookbooks/osmosis/recipes/default.rb +++ b/cookbooks/osmosis/recipes/default.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: osmosis +# Cookbook:: osmosis # Recipe:: default # -# Copyright 2013, OpenStreetMap Foundation +# Copyright:: 2013, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,16 +17,16 @@ # limitations under the License. # -include_recipe "chef" - -package "unzip" package "default-jre" -osmosis_package = "osmosis-#{node[:osmosis][:version]}.zip" -osmosis_directory = "/opt/osmosis-#{node[:osmosis][:version]}" +cache_dir = Chef::Config[:file_cache_path] + +osmosis_version = node[:osmosis][:version] +osmosis_package = "osmosis-#{osmosis_version}.zip" +osmosis_directory = "/opt/osmosis-#{osmosis_version}" -Dir.glob("/var/cache/chef/osmosis-*.zip").each do |zip| - next if zip == "/var/cache/chef/#{osmosis_package}" +Dir.glob("#{cache_dir}/osmosis-*.zip").each do |zip| + next if zip == "#{cache_dir}/#{osmosis_package}" file zip do action :delete @@ -37,25 +37,25 @@ end directory osmosis_directory do owner "root" group "root" - mode 0o755 + mode "755" end -execute "/var/cache/chef/#{osmosis_package}" do - action :nothing - command "unzip -q /var/cache/chef/#{osmosis_package}" - cwd osmosis_directory - user "root" +remote_file "#{cache_dir}/#{osmosis_package}" do + action :create_if_missing + source "https://github.com/openstreetmap/osmosis/releases/download/#{osmosis_version}/osmosis-#{osmosis_version}.zip" + owner "root" group "root" + mode "644" + backup false end -remote_file "/var/cache/chef/#{osmosis_package}" do - action :create_if_missing - source "https://bretth.dev.openstreetmap.org/osmosis-build/#{osmosis_package}" +archive_file "#{cache_dir}/#{osmosis_package}" do + action :nothing + destination osmosis_directory + overwrite true owner "root" group "root" - mode 0o644 - backup false - notifies :run, "execute[/var/cache/chef/#{osmosis_package}]" + subscribes :extract, "remote_file[#{cache_dir}/#{osmosis_package}]" end link "/usr/local/bin/osmosis" do