Add support for upgrading the chef server

diff --git a/cookbooks/chef/attributes/default.rb b/cookbooks/chef/attributes/default.rb
index 63fc2cf378bfe4b2943dad273419f4559fd80f16..c359c85f56867c7af720c962ad416259504aef0b 100644 (file)
--- a/cookbooks/chef/attributes/default.rb
+++ b/cookbooks/chef/attributes/default.rb
@@ -1,6 +1,9 @@
 # Add the opscode APT source for chef
 default[:apt][:sources] = node[:apt][:sources] | [ "opscode" ]
 
 # Add the opscode APT source for chef
 default[:apt][:sources] = node[:apt][:sources] | [ "opscode" ]
 

+# Set the default server version
+default[:chef][:server][:version] = "11.0.12-1"
+

 # Set the default client version
 default[:chef][:client][:version] = "11.12.2-1"
 
 # Set the default client version
 default[:chef][:client][:version] = "11.12.2-1"
 

diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb
index fc0a6ac6c63f66f4096fa283d9d2dbdf441dcd24..51df04baaf86f76cc8bf6ad7930c66196739ecb5 100644 (file)
--- a/cookbooks/chef/recipes/server.rb
+++ b/cookbooks/chef/recipes/server.rb
@@ -19,20 +19,52 @@
 
 include_recipe "apache::ssl"
 
 
 include_recipe "apache::ssl"
 

-service "chef-server-runsvdir" do
-  provider Chef::Provider::Service::Upstart
-  action [ :enable, :start ]
-  supports :status => true, :restart => true, :reload => true
+chef_platform = case node[:platform_version]
+                  when "12.10" then "12.04"
+                  else node[:platform_version]
+                end
+
+chef_package = "chef-server_#{node[:chef][:server][:version]}.ubuntu.#{chef_platform}_amd64.deb"
+
+directory "/var/cache/chef" do
+  owner "root"
+  group "root"
+  mode 0755

 end
 
 end
 

-apache_module "alias"
-apache_module "proxy_http"
+Dir.glob("/var/cache/chef/chef-server_*.deb").each do |deb|
+  if deb != "/var/cache/chef/#{chef_package}"
+    file deb do
+      action :delete
+      backup false
+    end
+  end
+end

 
 

-execute "chef-server-reconfigure" do
-  action :nothing
-  command "chef-server-ctl reconfigure"
-  user "root"
+remote_file "/var/cache/chef/#{chef_package}" do
+  source "https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/#{chef_platform}/x86_64/#{chef_package}"
+  owner "root"

   group "root"
   group "root"

+  mode 0644
+  backup false
+end
+
+dpkg_package "chef-erver" do
+  source "/var/cache/chef/#{chef_package}"
+  version node[:chef][:server][:version]
+  notifies :run, "execute[chef-server-reconfigure]"
+end
+
+ruby_block "/opt/chef-server/embedded/service/chef-server-webui/app/controllers/status_controller.rb" do
+  block do
+    rc = Chef::Util::FileEdit.new("/opt/chef-server/embedded/service/chef-server-webui/app/controllers/status_controller.rb")
+    rc.search_file_delete(/&rows=20/)
+    rc.write_file
+
+    if rc.file_edited?
+      resources(:execute => "chef-server-reconfigure").run_action(:run)
+    end
+  end

 end
 
 template "/etc/chef-server/chef-server.rb" do
 end
 
 template "/etc/chef-server/chef-server.rb" do


@@ -43,6 +75,22 @@ template "/etc/chef-server/chef-server.rb" do
   notifies :run, "execute[chef-server-reconfigure]"
 end
 
   notifies :run, "execute[chef-server-reconfigure]"
 end
 

+execute "chef-server-reconfigure" do
+  action :nothing
+  command "chef-server-ctl reconfigure"
+  user "root"
+  group "root"
+end
+
+service "chef-server-runsvdir" do
+  provider Chef::Provider::Service::Upstart
+  action [ :enable, :start ]
+  supports :status => true, :restart => true, :reload => true
+end
+
+apache_module "alias"
+apache_module "proxy_http"
+

 apache_site "chef.openstreetmap.org" do
   template "apache.erb"
 end
 apache_site "chef.openstreetmap.org" do
   template "apache.erb"
 end


@@ -53,15 +101,3 @@ template "/etc/cron.daily/chef-server-backup" do
   group "root"
   mode 0755
 end
   group "root"
   mode 0755
 end

-
-ruby_block "/opt/chef-server/embedded/service/chef-server-webui/app/controllers/status_controller.rb" do
-  block do
-    rc = Chef::Util::FileEdit.new("/opt/chef-server/embedded/service/chef-server-webui/app/controllers/status_controller.rb")
-    rc.search_file_delete(/&rows=20/)
-    rc.write_file
-
-    if rc.file_edited?
-      resources(:execute => "chef-server-reconfigure").run_action(:run)
-    end
-  end
-end