X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/f1fcd97392a104350c03f6b8618d7f2c7f52fffe..5b4f815f6cd8433be1d66b8376b71452f974b225:/cookbooks/chef/recipes/server.rb

diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb
index e6fed2151..ee27718f9 100644
--- a/cookbooks/chef/recipes/server.rb
+++ b/cookbooks/chef/recipes/server.rb
@@ -17,16 +17,46 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
-service "chef-server-runsvdir" do
-  provider Chef::Provider::Service::Upstart
-  action [ :enable, :start ]
-  supports :status => true, :restart => true, :reload => true
-end
+# chef_package = "chef-server-core_#{node[:chef][:server][:version]}_amd64.deb"
+#
+# directory "/var/cache/chef" do
+#   owner "root"
+#   group "root"
+#   mode 0755
+# end
+#
+# Dir.glob("/var/cache/chef/chef-server-core_*.deb").each do |deb|
+#   next if deb == "/var/cache/chef/#{chef_package}"
 
-apache_module "alias"
-apache_module "proxy_http"
+#   file deb do
+#     action :delete
+#     backup false
+#   end
+# end
+#
+# remote_file "/var/cache/chef/#{chef_package}" do
+#   source "https://web-dl.packagecloud.io/chef/stable/packages/ubuntu/#{node[:lsb][:codename]}/#{chef_package}"
+#   owner "root"
+#   group "root"
+#   mode 0644
+#   backup false
+# end
+#
+# dpkg_package "chef-server-core" do
+#   source "/var/cache/chef/#{chef_package}"
+#   version node[:chef][:server][:version]
+#   notifies :run, "execute[chef-server-reconfigure]"
+# end
+
+template "/etc/opscode/chef-server.rb" do
+  source "server.rb.erb"
+  owner "root"
+  group "root"
+  mode 0o640
+  notifies :run, "execute[chef-server-reconfigure]"
+end
 
 execute "chef-server-reconfigure" do
   action :nothing
@@ -35,12 +65,23 @@ execute "chef-server-reconfigure" do
   group "root"
 end
 
-template "/etc/chef-server/chef-server.rb" do
-  source "server.rb.erb"
-  owner "root"
-  group "root"
-  mode 0644
-  notifies :run, "execute[chef-server-reconfigure]"
+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]
+  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
@@ -51,5 +92,7 @@ template "/etc/cron.daily/chef-server-backup" do
   source "server-backup.cron.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
+
+munin_plugin "chef_status"