From: Tom Hughes <tom@compton.nu>
Date: Mon, 30 May 2016 08:51:10 +0000 (+0100)
Subject: Update chef server recipe for Ubuntu 16.04
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/e56b4e2f61850c044860cfe4874f8b4429866157?ds=sidebyside

Update chef server recipe for Ubuntu 16.04
---

diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb
index 31e7d1358..747014f9b 100644
--- a/cookbooks/chef/recipes/server.rb
+++ b/cookbooks/chef/recipes/server.rb
@@ -65,10 +65,14 @@ execute "chef-server-reconfigure" do
   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]
-  supports :status => true, :restart => true, :reload => true
 end
 
 apache_module "alias"