From 52a6648c80da6c1d69997a1574220256d5ed9666 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 1 Jul 2013 13:30:05 +0200
Subject: [PATCH] menotti is no longer a special munin server, it is the munin
 server

---
 modules/munin/manifests/master.pp      | 22 +++++++++---------
 modules/munin/templates/munin.conf.erb | 31 --------------------------
 2 files changed, 10 insertions(+), 43 deletions(-)

diff --git a/modules/munin/manifests/master.pp b/modules/munin/manifests/master.pp
index c097a3e3..b8ee54d8 100644
--- a/modules/munin/manifests/master.pp
+++ b/modules/munin/manifests/master.pp
@@ -9,17 +9,15 @@ class munin::master {
 		require => Package['munin'];
 	}
 
-	if $::hostname == 'menotti' {
-		ssl::service { 'munin.debian.org': }
-		file { '/etc/munin/munin-conf.d':
-			ensure  => directory,
-			mode    => '0755',
-			purge   => true,
-			force   => true,
-			recurse => true,
-			source  => 'puppet:///files/empty/',
-		}
-
-		Munin::Master-per-node<<| |>>
+	ssl::service { 'munin.debian.org': }
+	file { '/etc/munin/munin-conf.d':
+		ensure  => directory,
+		mode    => '0755',
+		purge   => true,
+		force   => true,
+		recurse => true,
+		source  => 'puppet:///files/empty/',
 	}
+
+	Munin::Master-per-node<<| |>>
 }
diff --git a/modules/munin/templates/munin.conf.erb b/modules/munin/templates/munin.conf.erb
index 532f7634..80d0c7e9 100644
--- a/modules/munin/templates/munin.conf.erb
+++ b/modules/munin/templates/munin.conf.erb
@@ -3,42 +3,11 @@
 ### USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<% if hostname != "menotti" -%>
-
-dbdir   /var/lib/munin
-htmldir /var/cache/munin/www
-logdir  /var/log/munin
-rundir  /var/run/munin
-tmpldir /etc/munin/templates
-
-<% else -%>
 # number of updaters to run
 max_processes 96
 rrdcached_socket /var/run/munin/rrdcached.sock/sock
 
 #html_strategy cgi
-<% end -%>
 graph_strategy cgi
 
 includedir /etc/munin/munin-conf.d
-
-<% if hostname != "menotti" -%>
-
-dbdir   /var/lib/munin
-htmldir /var/cache/munin/www
-logdir  /var/log/munin
-rundir  /var/run/munin
-tmpldir /etc/munin/templates
-
-<%= out = ''
-    scope.lookupvar('site::localinfo').keys.sort.each do |node|
-       if not scope.lookupvar('site::localinfo')[node]['no_munin']
-          out += '[' + node + ']
-    address ' + node + '
-
-'
-       end 
-    end
-out
-%>
-<% end -%>
-- 
2.39.2