X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/643f28e4f32f013c16d04378d7d1f3dd7d8edc17..67a74cd7644359f67bd5f80ae58fc451c6467d8a:/cookbooks/chef/recipes/server.rb diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb index fe668ad1d..549123916 100644 --- a/cookbooks/chef/recipes/server.rb +++ b/cookbooks/chef/recipes/server.rb @@ -8,7 +8,7 @@ # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -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" @@ -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