menotti is no longer a special munin server, it is the munin server

diff --git a/modules/munin/manifests/master.pp b/modules/munin/manifests/master.pp
index c097a3e3c7d0258f7041b20a14f029b561e38678..b8ee54d86f79a5143e4cbb3a60d85c3827f8860d 100644 (file)
--- 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 532f76343c52d23817ced151798ef286dd50ba3d..80d0c7e9f9a4745acff1a0aaeded90387f5d544b 100644 (file)
--- 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 -%>