Switch culebre, fafnir, ladon and trogdor to squid 4

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

diff --git a/cookbooks/osmosis/recipes/default.rb b/cookbooks/osmosis/recipes/default.rb
index 7532cd7acde2c80487e473db6106548df329245e..8de53eb37823aef3ce133c5c6eca333eae46f22e 100644 (file)
--- a/cookbooks/osmosis/recipes/default.rb
+++ b/cookbooks/osmosis/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: osmosis
+# Cookbook:: osmosis

 # Recipe:: default
 #
 # 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
 #
 #
 # 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -20,24 +20,24 @@
 include_recipe "chef"
 
 package "unzip"
 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]}"
 
 Dir.glob("/var/cache/chef/osmosis-*.zip").each do |zip|
 
 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"
   end
 end
 
 directory osmosis_directory do
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

 end
 
 execute "/var/cache/chef/#{osmosis_package}" do
 end
 
 execute "/var/cache/chef/#{osmosis_package}" do


@@ -50,10 +50,10 @@ end
 
 remote_file "/var/cache/chef/#{osmosis_package}" do
   action :create_if_missing
 
 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"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   backup false
   notifies :run, "execute[/var/cache/chef/#{osmosis_package}]"
 end
   backup false
   notifies :run, "execute[/var/cache/chef/#{osmosis_package}]"
 end