Complete reset back to pre-reboot configuration. Finally.

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

diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb
index 31e7d13584fbcb8c2fdf14a10ed57c74372ec26d..7a5f8fa5deef2b5b796037f8e5d4dfdaf0147ce8 100644 (file)
--- a/cookbooks/chef/recipes/server.rb
+++ b/cookbooks/chef/recipes/server.rb
@@ -54,7 +54,7 @@ template "/etc/opscode/chef-server.rb" do
   source "server.rb.erb"
   owner "root"
   group "root"
   source "server.rb.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   notifies :run, "execute[chef-server-reconfigure]"
 end
 
   notifies :run, "execute[chef-server-reconfigure]"
 end
 


@@ -65,10 +65,14 @@ execute "chef-server-reconfigure" do
   group "root"
 end
 
   group "root"
 end
 

-service "private-chef-runsvdir" do
-  provider Chef::Provider::Service::Upstart
+systemd_service "chef-server" do
+  description "Chef server"
+  after "network.target"
+  exec_start "/opt/opscode/embedded/bin/runsvdir-start"
+end
+
+service "chef-server" do

   action [:enable, :start]
   action [:enable, :start]

-  supports :status => true, :restart => true, :reload => true

 end
 
 apache_module "alias"
 end
 
 apache_module "alias"


@@ -82,14 +86,14 @@ template "/etc/cron.daily/chef-server-backup" do
   source "server-backup.cron.erb"
   owner "root"
   group "root"
   source "server-backup.cron.erb"
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

 end
 
 template "/etc/logrotate.d/chef-server" do
   source "logrotate.server.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/logrotate.d/chef-server" do
   source "logrotate.server.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

 end
 
 munin_plugin "chef_status"
 end
 
 munin_plugin "chef_status"