Use the xenial repository for HP tools on 16.04 and later

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

diff --git a/cookbooks/osmosis/recipes/default.rb b/cookbooks/osmosis/recipes/default.rb
index 42679ac3f956c10f78f527efbed8ba0ce5f39125..707ebe62018036bf30ed5755884cf63250f51331 100644 (file)
--- a/cookbooks/osmosis/recipes/default.rb
+++ b/cookbooks/osmosis/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,22 +19,25 @@
 
 include_recipe "chef"
 
+package "unzip"
+package "default-jre"
+
 osmosis_package = "osmosis-#{node[:osmosis][:version]}.zip"
 osmosis_directory = "/opt/osmosis-#{node[:osmosis][:version]}"
 
 Dir.glob("/var/cache/chef/osmosis-*.zip").each do |zip|
-  if zip != "/var/cache/chef/#{osmosis_package}"
-    file zip do
-      action :delete
-      backup false
-    end
+  next if zip == "/var/cache/chef/#{osmosis_package}"
+
+  file zip do
+    action :delete
+    backup false
   end
 end
 
 directory osmosis_directory do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 execute "/var/cache/chef/#{osmosis_package}" do
@@ -47,10 +50,10 @@ end
 
 remote_file "/var/cache/chef/#{osmosis_package}" do
   action :create_if_missing
-  source "http://bretth.dev.openstreetmap.org/osmosis-build/#{osmosis_package}"
+  source "https://bretth.dev.openstreetmap.org/osmosis-build/#{osmosis_package}"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   backup false
   notifies :run, "execute[/var/cache/chef/#{osmosis_package}]"
 end