Use passenger-config to restart rails

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

diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb
index 7a58054900ace1d724d8d7c3fa37985d1be4d5f5..a5c1042151cdd203265862412b528419df043945 100644 (file)
--- a/cookbooks/chef/recipes/default.rb
+++ b/cookbooks/chef/recipes/default.rb
@@ -22,8 +22,9 @@ chef_gem "pony"
 chef_package = "chef_#{node[:chef][:client][:version]}_amd64.deb"
 
 chef_platform = case node[:platform_version]
 chef_package = "chef_#{node[:chef][:client][:version]}_amd64.deb"
 
 chef_platform = case node[:platform_version]

-                  when "12.10" then "12.04"
-                  else 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
                 end
 
 directory "/var/cache/chef" do


@@ -33,21 +34,21 @@ directory "/var/cache/chef" do
 end
 
 Dir.glob("/var/cache/chef/chef_*.deb").each do |deb|
 end
 
 Dir.glob("/var/cache/chef/chef_*.deb").each do |deb|

-  if deb != "/var/cache/chef/#{chef_package}"
-    file deb do
-      action :delete
-      backup false
-    end
+  next if deb == "/var/cache/chef/#{chef_package}"
+
+  file deb do
+    action :delete
+    backup false

   end
 end
 
 remote_file "/var/cache/chef/#{chef_package}" do
   end
 end
 
 remote_file "/var/cache/chef/#{chef_package}" do

-  action :create_if_missing

   source "https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/#{chef_platform}/x86_64/#{chef_package}"
   owner "root"
   group "root"
   mode 0644
   backup false
   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
 end
 
 dpkg_package "chef" do


@@ -95,7 +96,20 @@ template "/etc/logrotate.d/chef" do
   mode 0644
 end
 
   mode 0644
 end
 

-directory "/etc/chef/ohai" do
+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 node[:ohai][:plugin_dir] do

   owner "root"
   group "root"
   mode 0755
   owner "root"
   group "root"
   mode 0755


@@ -109,7 +123,7 @@ end
 
 service "chef-client" do
   provider Chef::Provider::Service::Upstart
 
 service "chef-client" do
   provider Chef::Provider::Service::Upstart

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true, :reload => true
   subscribes :restart, "dpkg_package[chef]"
   subscribes :restart, "template[/etc/init/chef-client.conf]"
   supports :status => true, :restart => true, :reload => true
   subscribes :restart, "dpkg_package[chef]"
   subscribes :restart, "template[/etc/init/chef-client.conf]"