Move db-slave and nominatim-slave roles to public repository

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

diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb
index 2c33218c59db40b97d5a39e31b851e4721cc70cf..31e7d13584fbcb8c2fdf14a10ed57c74372ec26d 100644 (file)
--- a/cookbooks/chef/recipes/server.rb
+++ b/cookbooks/chef/recipes/server.rb
@@ -19,30 +19,77 @@
 
 include_recipe "apache::ssl"
 
 
 include_recipe "apache::ssl"
 

-service "chef-server-runsvdir" do
+# 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/opscode/chef-server.rb" do
+  source "server.rb.erb"
+  owner "root"
+  group "root"
+  mode 0644
+  notifies :run, "execute[chef-server-reconfigure]"
+end
+
+execute "chef-server-reconfigure" do
+  action :nothing
+  command "chef-server-ctl reconfigure"
+  user "root"
+  group "root"
+end
+
+service "private-chef-runsvdir" do

   provider Chef::Provider::Service::Upstart
   provider Chef::Provider::Service::Upstart

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true, :reload => true
 end
 
 apache_module "alias"
 apache_module "proxy_http"
 
   supports :status => true, :restart => true, :reload => true
 end
 
 apache_module "alias"
 apache_module "proxy_http"
 

-execute "chef-server-reconfigure" do
-  action :nothing
-  command "chef-server-ctl reconfigure"
-  user "root"
+apache_site "chef.openstreetmap.org" do
+  template "apache.erb"
+end
+
+template "/etc/cron.daily/chef-server-backup" do
+  source "server-backup.cron.erb"
+  owner "root"

   group "root"
   group "root"

+  mode 0755

 end
 
 end
 

-template "/etc/chef-server/chef-server.rb" do
-  source "server.rb.erb"
+template "/etc/logrotate.d/chef-server" do
+  source "logrotate.server.erb"

   owner "root"
   group "root"
   mode 0644
   owner "root"
   group "root"
   mode 0644

-  notifies :run, "execute[chef-server-reconfigure]"

 end
 
 end
 

-apache_site "chef.openstreetmap.org" do
-  template "apache.erb"
-end
+munin_plugin "chef_status"