Move log storage to backup server

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

diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb
index fc0a6ac6c63f66f4096fa283d9d2dbdf441dcd24..d5923ccb6dc7fdc39dfa3e905fc2d37d135b9d59 100644 (file)
--- a/cookbooks/chef/recipes/server.rb
+++ b/cookbooks/chef/recipes/server.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: chef
+# Cookbook:: chef

 # Recipe:: server
 #
 # Recipe:: server
 #

-# Copyright 2010, OpenStreetMap Foundation
+# Copyright:: 2010, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,16 +17,44 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apache::ssl"
+include_recipe "apache"
+include_recipe "chef::knife"

 
 

-service "chef-server-runsvdir" do
-  provider Chef::Provider::Service::Upstart
-  action [ :enable, :start ]
-  supports :status => true, :restart => true, :reload => true
-end
+# cache_dir = Chef::Config[:file_cache_path]
+#
+# chef_version = node[:chef][:server][:version]
+# chef_package = "chef-server-core_#{chef_version}-1_amd64.deb"
+#
+# Dir.glob("#{cache_dir}/chef-server-core_*.deb").each do |deb|
+#   next if deb == "#{cache_dir}/#{chef_package}"
+#
+#   file deb do
+#     action :delete
+#     backup false
+#   end
+# end
+#
+# remote_file "#{cache_dir}/#{chef_package}" do
+#   source "https://packages.chef.io/files/stable/chef-server/#{chef_version}/ubuntu/22.04/chef-server-core_#{chef_version}-1_amd64.deb"
+#   owner "root"
+#   group "root"
+#   mode 0644
+#   backup false
+# end
+#
+# dpkg_package "chef-server-core" do
+#   source "#{cache_dir}/#{chef_package}"
+#   version "#{chef_version}-1"
+#   notifies :run, "execute[chef-server-reconfigure]"
+# end

 
 

-apache_module "alias"
-apache_module "proxy_http"
+template "/etc/opscode/chef-server.rb" do
+  source "server.rb.erb"
+  owner "root"
+  group "root"
+  mode "640"
+  notifies :run, "execute[chef-server-reconfigure]"
+end

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


@@ -35,12 +63,31 @@ 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"
+execute "chef-server-restart" do
+  action :nothing
+  command "chef-server-ctl restart"
+  user "root"

   group "root"
   group "root"

-  mode 0644
-  notifies :run, "execute[chef-server-reconfigure]"
+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]
+  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
 end
 
 apache_site "chef.openstreetmap.org" do


@@ -51,17 +98,5 @@ 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
-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
+  mode "755"

 end
 end