move nominatim tablespace configuration to server roles

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

diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb
index b0d30cc9d97ad30ed4c7abee038469b234b99e9c..b440d85e927645223aa5a6a71511067e1020f8f5 100644 (file)
--- a/cookbooks/chef/recipes/default.rb
+++ b/cookbooks/chef/recipes/default.rb
@@ -21,6 +21,12 @@ chef_gem "pony"
 
 chef_package = "chef_#{node[:chef][:client][:version]}_amd64.deb"
 
+chef_platform = case node[:platform_version]
+                  when "12.10" then "12.04"
+                  when "14.04" then "13.04"
+                  else node[:platform_version]
+                end
+
 directory "/var/cache/chef" do
   owner "root"
   group "root"
@@ -37,12 +43,12 @@ Dir.glob("/var/cache/chef/chef_*.deb").each do |deb|
 end
 
 remote_file "/var/cache/chef/#{chef_package}" do
-  action :create_if_missing
-  source "https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/#{node[:platform_version]}/x86_64/#{chef_package}"
+  source "https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/#{chef_platform}/x86_64/#{chef_package}"
   owner "root"
   group "root"
   mode 0644
   backup false
+  ignore_failure true
 end
 
 dpkg_package "chef" do
@@ -90,6 +96,19 @@ template "/etc/logrotate.d/chef" do
   mode 0644
 end
 
+directory "/etc/chef/trusted_certs" do
+  owner "root"
+  group "root"
+  mode 0755
+end
+
+template "/etc/chef/trusted_certs/verisign.pem" do
+  source "verisign.pem.erb"
+  owner "root"
+  group "root"
+  mode 0644
+end
+
 directory "/etc/chef/ohai" do
   owner "root"
   group "root"