Remove munin server role

diff --git a/.kitchen.yml b/.kitchen.yml
index 39fbc4de241765a16145cb5e32629f6a15223b74..80fe1b58b3194fbd5a09506ab1216fc347058271 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -256,9 +256,6 @@ suites:
   - name: munin-plugins
     run_list:
       - recipe[munin::plugins]
-  - name: munin-server
-    run_list:
-      - recipe[munin::server]
   - name: mysql
     run_list:
       - recipe[mysql::default]

diff --git a/cookbooks/munin/metadata.rb b/cookbooks/munin/metadata.rb
index 6af59ef18e4ec0bb2aca7e59cee34be534385038..98b0747075852f28744c048027ae0a0654e0b90d 100644 (file)
--- a/cookbooks/munin/metadata.rb
+++ b/cookbooks/munin/metadata.rb
@@ -6,5 +6,4 @@ description       "Installs and configures munin"
 
 version           "1.0.0"
 supports          "ubuntu"
-depends           "apache"
 depends           "networking"

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index 1501c2c90d8532f0dd36da42cf35c2c893e0ddaf..3bbc4c49213b7ac5c1e0b7d809678efed044e0bf 100644 (file)
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -28,3 +28,8 @@ end
 package "munin-node" do
   action :purge
 end
+
+directory "/etc/munin" do
+  action :delete
+  recursive true
+end

diff --git a/cookbooks/munin/recipes/server.rb b/cookbooks/munin/recipes/server.rb
deleted file mode 100644 (file)
index fda5149..0000000
--- a/cookbooks/munin/recipes/server.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# Cookbook:: munin
-# Recipe:: server
-#
-# 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
-#
-#     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,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-include_recipe "apache"
-
-file "/etc/default/rrdcached" do
-  action :delete
-end
-
-directory "/var/lib/munin/rrdcached" do
-  action :delete
-  recursive true
-end
-
-service "rrdcached" do
-  action [:stop, :disable]
-end
-
-file "/etc/munin/munin.conf" do
-  action :delete
-end
-
-directory "/srv/munin.openstreetmap.org" do
-  action :delete
-  recursive true
-end
-
-ssl_certificate "munin.openstreetmap.org" do
-  action :delete
-end
-
-apache_site "munin.openstreetmap.org" do
-  action :delete
-end
-
-file "/etc/cron.daily/munin-backup" do
-  action :delete
-end
-
-package "munin" do
-  action :purge
-end
-
-package "rrdcached" do
-  action :purge
-end
-
-package "libcgi-fast-perl" do
-  action :purge
-end

diff --git a/roles/mail.rb b/roles/mail.rb
index 6648ce7d8c54d86d74949fe7b5d55e619e34847e..de74af25ae1bd47765e3a8bdaa6eacded76b5fd3 100644 (file)
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -76,7 +76,6 @@ default_attributes(
       "clamav" => "root",
       "rails" => "root",
       "trac" => "root",
-      "munin" => "root",
       "prometheus" => "root",
       "www-data" => "root",
       "osmbackup" => "root",

diff --git a/roles/munin.rb b/roles/munin.rb
deleted file mode 100644 (file)
index 046360b..0000000
--- a/roles/munin.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-name "munin"
-description "Role applied to all munin servers"
-
-run_list(
-  "recipe[munin::server]"
-)

diff --git a/roles/naga.rb b/roles/naga.rb
index 4b8587fd9e294571528f34a183f9f024f969b71b..b12795a97d2c0877b3de316ca716c5537f666f63 100644 (file)
--- a/roles/naga.rb
+++ b/roles/naga.rb
@@ -38,7 +38,6 @@ run_list(
   "role[trac]",
   "role[irc]",
   "role[blogs]",
-  "role[munin]",
   "role[switch2osm]",
   "recipe[foundation::mastodon]",
   "recipe[foundation::owg]",

diff --git a/test/data_bags/db/passwords.json b/test/data_bags/db/passwords.json
index 6e381c752ffced29014a1be7437316f1fb23c461..532c1d014e8c67e3b6b1242844bb05dba1cdcb00 100644 (file)
--- a/test/data_bags/db/passwords.json
+++ b/test/data_bags/db/passwords.json
@@ -6,6 +6,5 @@
   "planetdump": "planetdump-password",
   "planetdiff": "planetdiff-password",
   "backup": "backup-password",
-  "munin": "munin-password",
   "replication": "replication-password"
 }

diff --git a/test/integration/munin-server/inspec/munin_spec.rb b/test/integration/munin-server/inspec/munin_spec.rb
deleted file mode 100644 (file)
index 766d65c..0000000
--- a/test/integration/munin-server/inspec/munin_spec.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-describe package("munin") do
-  it { should_not be_installed }
-end

diff --git a/test/integration/munin-server/inspec/rrdcached_spec.rb b/test/integration/munin-server/inspec/rrdcached_spec.rb
deleted file mode 100644 (file)
index e097789..0000000
--- a/test/integration/munin-server/inspec/rrdcached_spec.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-describe package("rrdcached") do
-  it { should_not be_installed }
-end
-
-describe service("rrdcached") do
-  it { should_not be_enabled }
-  it { should_not be_running }
-end