X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/6da11d5333d3a636b7ee9861838e24ae845a3694..9e083ebce8a430d87164a3d790b3ff98fdf5c4e1:/cookbooks/osmosis/recipes/default.rb

diff --git a/cookbooks/osmosis/recipes/default.rb b/cookbooks/osmosis/recipes/default.rb
index 7532cd7ac..4160a9b40 100644
--- a/cookbooks/osmosis/recipes/default.rb
+++ b/cookbooks/osmosis/recipes/default.rb
@@ -1,14 +1,14 @@
 #
-# 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.
 # 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,
@@ -20,42 +20,45 @@
 include_recipe "chef"
 
 package "unzip"
-package "openjdk-6-jre"
+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|
-  if zip != "/var/cache/chef/#{osmosis_package}"
-    file zip do
-      action :delete
-      backup false
-    end
+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
+    backup false
   end
 end
 
 directory osmosis_directory do
   owner "root"
   group "root"
-  mode 0755
-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 0o755
 end
 
-remote_file "/var/cache/chef/#{osmosis_package}" do
+remote_file "#{cache_dir}/#{osmosis_package}" do
   action :create_if_missing
-  source "http://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"
-  mode 0644
+  mode 0o644
   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