Update carto stylesheet to v4.10.0

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

diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb
index 2ebf64f72dc6be392acab827923bf87edc9caa6b..5491239167f253480702caee96ae77f4166c46b3 100644 (file)
--- 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
 #
 # 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,
 #
 # 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.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apache::ssl"
+include_recipe "apache"

 
 # chef_package = "chef-server-core_#{node[:chef][:server][:version]}_amd64.deb"
 #
 
 # chef_package = "chef-server-core_#{node[:chef][:server][:version]}_amd64.deb"
 #


@@ -65,6 +65,13 @@ execute "chef-server-reconfigure" do
   group "root"
 end
 
   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"
 systemd_service "chef-server" do
   description "Chef server"
   after "network.target"


@@ -73,6 +80,7 @@ end
 
 service "chef-server" do
   action [:enable, :start]
 
 service "chef-server" do
   action [:enable, :start]

+  subscribes :restart, "systemd_service[chef-server]"

 end
 
 apache_module "alias"
 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"]
 
 ssl_certificate "chef.openstreetmap.org" do
   domains ["chef.openstreetmap.org", "chef.osm.org"]

-  fallback_certificate "openstreetmap"

   notifies :reload, "service[apache2]"
   notifies :reload, "service[apache2]"

+  notifies :run, "execute[chef-server-restart]"

 end
 
 apache_site "chef.openstreetmap.org" do
 end
 
 apache_site "chef.openstreetmap.org" do