Remove setting of level0.overpass_url_prefix, default should be fine.

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

diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb
index e76e074ea8d15c8466a88a5174b46a967f3c0f74..7a5f8fa5deef2b5b796037f8e5d4dfdaf0147ce8 100644 (file)
--- a/cookbooks/chef/recipes/server.rb
+++ b/cookbooks/chef/recipes/server.rb
@@ -19,60 +19,42 @@
 
 include_recipe "apache::ssl"
 
-chef_platform = case node[:platform_version]
-                when "12.10" then "12.04"
-                when "14.04" then "12.04"
-                else node[:platform_version]
-                end
-
-chef_package = "chef-server_#{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_*.deb").each do |deb|
-  next if deb == "/var/cache/chef/#{chef_package}"
-
-  file deb do
-    action :delete
-    backup false
-  end
-end
-
-remote_file "/var/cache/chef/#{chef_package}" do
-  source "https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/#{chef_platform}/x86_64/#{chef_package}"
-  owner "root"
-  group "root"
-  mode 0644
-  backup false
-end
-
-dpkg_package "chef-erver" do
-  source "/var/cache/chef/#{chef_package}"
-  version node[:chef][:server][:version]
-  notifies :run, "execute[chef-server-reconfigure]"
-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
+# 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}"
+
+#   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/chef-server/chef-server.rb" do
+template "/etc/opscode/chef-server.rb" do
   source "server.rb.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :run, "execute[chef-server-reconfigure]"
 end
 
@@ -83,10 +65,14 @@ execute "chef-server-reconfigure" do
   group "root"
 end
 
-service "chef-server-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
 end
 
 apache_module "alias"
@@ -100,12 +86,14 @@ 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
+  mode 0o644
 end
+
+munin_plugin "chef_status"