Remove munin

[chef.git] / cookbooks / overpass / recipes / default.rb

diff --git a/cookbooks/overpass/recipes/default.rb b/cookbooks/overpass/recipes/default.rb
index 720b113216d342abe8f6ccec947cd0aa5f15eb28..47469716875a78bbdfb801df44f002addb2959ea 100644 (file)
--- a/cookbooks/overpass/recipes/default.rb
+++ b/cookbooks/overpass/recipes/default.rb
@@ -27,7 +27,7 @@ username = "overpass"
 basedir = data_bag_item("accounts", username)["home"]
 web_passwords = data_bag_item("web", "passwords")
 
-%w[bin site diffs db src munin].each do |dirname|
+%w[bin site diffs db src].each do |dirname|
   directory "#{basedir}/#{dirname}" do
     owner username
     group username
@@ -36,6 +36,12 @@ web_passwords = data_bag_item("web", "passwords")
   end
 end
 
+# FIXME: Remove purge post munin removal
+directory "#{basedir}/munin" do
+  action :delete
+  recursive true
+end
+
 ## Install overpass from source
 
 srcdir = "#{basedir}/src/osm-3s_v#{node[:overpass][:version]}"
@@ -229,24 +235,6 @@ template "/etc/logrotate.d/overpass" do
   variables :logdir => logdir
 end
 
-# Munin scripts
-
-%w[db_lag request_count].each do |name|
-  template "#{basedir}/munin/overpass_#{name}" do
-    source "munin_#{name}.erb"
-    owner username
-    group username
-    mode "755"
-    variables :basedir => basedir
-  end
-
-  munin_plugin "overpass_#{name}" do
-    target "#{basedir}/munin/overpass_#{name}"
-    conf "munin.erb"
-    conf_variables :user => username
-  end
-end
-
 prometheus_exporter "overpass" do
   port 9898
   user username