Update MAC addresses for OOB on draco, grindtooth and sarel

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

diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb
index 54efa19e5531de7738b8da929117a40d6ee340be..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
 #
-#     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,9 +17,10 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+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"
@@ -37,7 +38,7 @@ include_recipe "apache::ssl"
 # 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
@@ -46,7 +47,7 @@ include_recipe "apache::ssl"
 #
 # 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
 
@@ -54,7 +55,7 @@ template "/etc/opscode/chef-server.rb" do
   source "server.rb.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o640
   notifies :run, "execute[chef-server-reconfigure]"
 end
 
@@ -65,15 +66,33 @@ execute "chef-server-reconfigure" do
   group "root"
 end
 
-service "private-chef-runsvdir" do
-  provider Chef::Provider::Service::Upstart
+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"
+  exec_start "/opt/opscode/embedded/bin/runsvdir-start"
+end
+
+service "chef-server" do
   action [:enable, :start]
-  supports :status => true, :restart => true, :reload => true
+  subscribes :restart, "systemd_service[chef-server]"
 end
 
 apache_module "alias"
 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
   template "apache.erb"
 end
@@ -82,12 +101,7 @@ template "/etc/cron.daily/chef-server-backup" do
   source "server-backup.cron.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
-template "/etc/logrotate.d/chef-server" do
-  source "logrotate.server.erb"
-  owner "root"
-  group "root"
-  mode 0644
-end
+munin_plugin "chef_status"