Bump cookstyle from 6.15.5 to 6.15.9

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

diff --git a/cookbooks/osmosis/recipes/default.rb b/cookbooks/osmosis/recipes/default.rb
index 8de53eb37823aef3ce133c5c6eca333eae46f22e..ff38e90e0465da8d84b61c710593585bf667b6b7 100644 (file)
--- a/cookbooks/osmosis/recipes/default.rb
+++ b/cookbooks/osmosis/recipes/default.rb
@@ -22,11 +22,14 @@ include_recipe "chef"
 package "unzip"
 package "default-jre"
 
 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]

 
 

-Dir.glob("/var/cache/chef/osmosis-*.zip").each do |zip|
-  next if zip == "/var/cache/chef/#{osmosis_package}"
+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}"

 
   file zip do
     action :delete
 
   file zip do
     action :delete


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

-  mode 0o755
-end
-
-execute "/var/cache/chef/#{osmosis_package}" do
-  action :nothing
-  command "unzip -q /var/cache/chef/#{osmosis_package}"
-  cwd osmosis_directory
-  user "root"
-  group "root"
+  mode "755"

 end
 
 end
 

-remote_file "/var/cache/chef/#{osmosis_package}" do
+remote_file "#{cache_dir}/#{osmosis_package}" do

   action :create_if_missing
   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
   backup false

-  notifies :run, "execute[/var/cache/chef/#{osmosis_package}]"
+end
+
+execute "#{cache_dir}/#{osmosis_package}" do
+  action :nothing
+  command "unzip -q #{cache_dir}/#{osmosis_package}"
+  cwd osmosis_directory
+  user "root"
+  group "root"
+  subscribes :run, "remote_file[#{cache_dir}/#{osmosis_package}]"

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