Correct over aggressive search and replace

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

diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb
index 8edf4e5593fac583dd180862a3497e7d87c4edab..d3a26755a4b21029c85986d020902b211762b58d 100644 (file)
--- a/cookbooks/chef/recipes/server.rb
+++ b/cookbooks/chef/recipes/server.rb
@@ -65,6 +65,13 @@ execute "chef-server-reconfigure" do
   group "root"
 end
 
+execute "chef-server-restart" do
+  action :nothing
+  command "chef-server-ctl restart"
+  user "root"
+  group "root"
+end
+
 systemd_service "chef-server" do
   description "Chef server"
   after "network.target"
@@ -73,6 +80,7 @@ end
 
 service "chef-server" do
   action [:enable, :start]
+  subscribes :restart, "systemd_service[chef-server]"
 end
 
 apache_module "alias"
@@ -81,6 +89,7 @@ apache_module "proxy_http"
 ssl_certificate "chef.openstreetmap.org" do
   domains ["chef.openstreetmap.org", "chef.osm.org"]
   notifies :reload, "service[apache2]"
+  notifies :run, "execute[chef-server-restart]"
 end
 
 apache_site "chef.openstreetmap.org" do