X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/7feb5d6e412f76ee23cfe21e47c9868293010f24..1751b31885773d33dcf3efb396f198f1d10a2221:/cookbooks/munin/recipes/server.rb

diff --git a/cookbooks/munin/recipes/server.rb b/cookbooks/munin/recipes/server.rb
index a70ff14fe..fda514948 100644
--- a/cookbooks/munin/recipes/server.rb
+++ b/cookbooks/munin/recipes/server.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: munin
+# Cookbook:: munin
 # 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.
@@ -19,93 +19,48 @@
 
 include_recipe "apache"
 
-package "munin"
-package "rrdcached"
-package "libcgi-fast-perl"
-
-template "/etc/default/rrdcached" do
-  source "rrdcached.erb"
-  owner "root"
-  group "root"
-  mode 0o644
+file "/etc/default/rrdcached" do
+  action :delete
 end
 
 directory "/var/lib/munin/rrdcached" do
-  owner "munin"
-  group "munin"
-  mode 0o755
+  action :delete
+  recursive true
 end
 
 service "rrdcached" do
-  action [:enable, :start]
-  subscribes :restart, "template[/etc/default/rrdcached]"
+  action [:stop, :disable]
 end
 
-munin_plugin "rrdcached"
-
-expiry_time = 14 * 86400
-
-clients = search(:node, "recipes:munin\\:\\:default").sort_by(&:name) # ~FC010
-frontends = search(:node, "recipes:web\\:\\:frontend").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.map(&:name).sort # ~FC010
-backends = search(:node, "recipes:web\\:\\:backend").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.map(&:name).sort # ~FC010
-tilecaches = search(:node, "roles:tilecache").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by(&:name).map do |n|
-  { :name => n.name.split(".").first, :interface => n.interfaces(:role => :external).first[:interface].tr(".", "_") }
-end
-renderers = search(:node, "roles:tile").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by(&:name).map do |n|
-  { :name => n.name.split(".").first, :interface => n.interfaces(:role => :external).first[:interface].tr(".", "_") }
-end
-geocoders = search(:node, "roles:nominatim").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by(&:name).map do |n|
-  { :name => n.name.split(".").first, :interface => n.interfaces(:role => :external).first[:interface].tr(".", "_") }
+file "/etc/munin/munin.conf" do
+  action :delete
 end
 
-template "/etc/munin/munin.conf" do
-  source "munin.conf.erb"
-  owner "root"
-  group "root"
-  mode 0o644
-  variables :expiry_time => expiry_time, :clients => clients,
-            :frontends => frontends, :backends => backends,
-            :tilecaches => tilecaches, :renderers => renderers,
-            :geocoders => geocoders
+directory "/srv/munin.openstreetmap.org" do
+  action :delete
+  recursive true
 end
 
-apache_module "fcgid"
-apache_module "rewrite"
-apache_module "headers"
-
-remote_directory "/srv/munin.openstreetmap.org" do
-  source "www"
-  owner "root"
-  group "root"
-  mode 0o755
-  files_owner "root"
-  files_group "root"
-  files_mode 0o644
+ssl_certificate "munin.openstreetmap.org" do
+  action :delete
 end
 
-# directory to put dumped files in
-directory "/srv/munin.openstreetmap.org/dumps" do
-  owner "www-data"
-  group "www-data"
-  mode 0o755
+apache_site "munin.openstreetmap.org" do
+  action :delete
 end
 
-ssl_certificate "munin.openstreetmap.org" do
-  domains ["munin.openstreetmap.org", "munin.osm.org"]
-  notifies :reload, "service[apache2]"
+file "/etc/cron.daily/munin-backup" do
+  action :delete
 end
 
-apache_site "munin.openstreetmap.org" do
-  template "apache.erb"
+package "munin" do
+  action :purge
 end
 
-template "/etc/cron.daily/munin-backup" do
-  source "backup.cron.erb"
-  owner "root"
-  group "root"
-  mode 0o755
+package "rrdcached" do
+  action :purge
 end
 
-munin_plugin "munin_stats"
-munin_plugin "munin_update"
-munin_plugin "munin_rrdcached"
+package "libcgi-fast-perl" do
+  action :purge
+end