Mark dhcp servers as authoritative

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

diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb
index 8edf4e5593fac583dd180862a3497e7d87c4edab..12c43840a1774913567bdf113f21b82b024319d4 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,


@@ -19,7 +19,8 @@
 
 include_recipe "apache"
 
 
 include_recipe "apache"
 

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

 #
 # directory "/var/cache/chef" do
 #   owner "root"
 #
 # directory "/var/cache/chef" do
 #   owner "root"


@@ -37,7 +38,7 @@ include_recipe "apache"
 # end
 #
 # remote_file "/var/cache/chef/#{chef_package}" do
 # end
 #
 # remote_file "/var/cache/chef/#{chef_package}" do

-#   source "https://web-dl.packagecloud.io/chef/stable/packages/ubuntu/#{node[:lsb][:codename]}/#{chef_package}"
+#   source "https://packages.chef.io/files/stable/chef-server/#{chef_version}/ubuntu/16.04/#{chef_package}"

 #   owner "root"
 #   group "root"
 #   mode 0644
 #   owner "root"
 #   group "root"
 #   mode 0644


@@ -46,7 +47,7 @@ include_recipe "apache"
 #
 # dpkg_package "chef-server-core" do
 #   source "/var/cache/chef/#{chef_package}"
 #
 # dpkg_package "chef-server-core" do
 #   source "/var/cache/chef/#{chef_package}"

-#   version node[:chef][:server][:version]
+#   version "#{chef_version}-1"

 #   notifies :run, "execute[chef-server-reconfigure]"
 # end
 
 #   notifies :run, "execute[chef-server-reconfigure]"
 # end
 


@@ -65,6 +66,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 +81,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"


@@ -81,6 +90,7 @@ apache_module "proxy_http"
 ssl_certificate "chef.openstreetmap.org" do
   domains ["chef.openstreetmap.org", "chef.osm.org"]
   notifies :reload, "service[apache2]"
 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
 end
 
 apache_site "chef.openstreetmap.org" do