Rename MaxRequestsPerChild to MaxConnectionsPerChild

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

diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb
index fc0a6ac6c63f66f4096fa283d9d2dbdf441dcd24..c34efeddaa8a3977689fff83d32e91612b6c36bf 100644 (file)
--- a/cookbooks/chef/recipes/server.rb
+++ b/cookbooks/chef/recipes/server.rb
@@ -19,14 +19,44 @@
 
 include_recipe "apache::ssl"
 
 
 include_recipe "apache::ssl"
 

-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 0o644
+  notifies :run, "execute[chef-server-reconfigure]"
+end

 
 execute "chef-server-reconfigure" do
   action :nothing
 
 execute "chef-server-reconfigure" do
   action :nothing


@@ -35,14 +65,19 @@ execute "chef-server-reconfigure" do
   group "root"
 end
 
   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]

 end
 
 end
 

+apache_module "alias"
+apache_module "proxy_http"
+

 apache_site "chef.openstreetmap.org" do
   template "apache.erb"
 end
 apache_site "chef.openstreetmap.org" do
   template "apache.erb"
 end


@@ -51,17 +86,7 @@ template "/etc/cron.daily/chef-server-backup" do
   source "server-backup.cron.erb"
   owner "root"
   group "root"
   source "server-backup.cron.erb"
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

 end
 
 end
 

-ruby_block "/opt/chef-server/embedded/service/chef-server-webui/app/controllers/status_controller.rb" do
-  block do
-    rc = Chef::Util::FileEdit.new("/opt/chef-server/embedded/service/chef-server-webui/app/controllers/status_controller.rb")
-    rc.search_file_delete(/&rows=20/)
-    rc.write_file
-
-    if rc.file_edited?
-      resources(:execute => "chef-server-reconfigure").run_action(:run)
-    end
-  end
-end
+munin_plugin "chef_status"