X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e75a75dcec6ef6fcb91f6c1b229bb6cd907ce2f6..ae4d13c8ba1b86d2f94bcdec799d0db052425333:/cookbooks/chef/recipes/server.rb?ds=inline

diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb
index 2ebf64f72..d3a26755a 100644
--- a/cookbooks/chef/recipes/server.rb
+++ b/cookbooks/chef/recipes/server.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 # chef_package = "chef-server-core_#{node[:chef][:server][:version]}_amd64.deb"
 #
@@ -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"
@@ -80,8 +88,8 @@ apache_module "proxy_http"
 
 ssl_certificate "chef.openstreetmap.org" do
   domains ["chef.openstreetmap.org", "chef.osm.org"]
-  fallback_certificate "openstreetmap"
   notifies :reload, "service[apache2]"
+  notifies :run, "execute[chef-server-restart]"
 end
 
 apache_site "chef.openstreetmap.org" do