X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/098634e073c80dfde4038715bc683985b18c5184..41b1edf21c531ee0def59463c5a415af24875d30:/cookbooks/chef/recipes/server.rb

diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb
index 54efa19e5..ee27718f9 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"
 #
@@ -54,7 +54,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 +65,25 @@ execute "chef-server-reconfigure" do
   group "root"
 end
 
-service "private-chef-runsvdir" do
-  provider Chef::Provider::Service::Upstart
+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]"
+end
+
 apache_site "chef.openstreetmap.org" do
   template "apache.erb"
 end
@@ -82,12 +92,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"