From: Martin Zobel-Helas <zobel@debian.org>
Date: Mon, 18 Jan 2010 20:15:06 +0000 (+0100)
Subject: Merge branch 'ferm'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e152ea9072eba0cf0b3920c779e3fdb8ad3880fd;hp=b507681f854f09cfc91da7b0b3a625c9d3c30022;p=dsa-puppet.git

Merge branch 'ferm'
---

diff --git a/files/etc/puppet/puppet.conf b/files/etc/puppet/puppet.conf
index 1a839469..8ffabccf 100644
--- a/files/etc/puppet/puppet.conf
+++ b/files/etc/puppet/puppet.conf
@@ -11,7 +11,7 @@ rundir=/var/run/puppet
 factpath=$vardir/facts
 pluginsync=true
 # This is the default environment for all clients
-environment=production 
+environment=staging
 
 [puppetmasterd]
 templatedir=/etc/puppet/templates
diff --git a/manifests/site.pp b/manifests/site.pp
index 4525e506..b1085791 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -51,6 +51,7 @@ node default {
     case $hostname {
         spohr: {
                       include nagios::server
+                      include munin-node::master
         }
         default: {
 		      include nagios::client
diff --git a/modules/munin-node/manifests/master.pp b/modules/munin-node/manifests/master.pp
new file mode 100644
index 00000000..c7eb80b5
--- /dev/null
+++ b/modules/munin-node/manifests/master.pp
@@ -0,0 +1,11 @@
+class munin-node::master inherits munin-node {
+
+    package { munin: ensure => installed }
+
+    file {
+        "/etc/munin/munin.conf":
+            content => template("munin/munin.conf.erb"),
+            require => Package["munin"];
+    }
+}
+
diff --git a/modules/munin-node/templates/munin.conf.erb b/modules/munin-node/templates/munin.conf.erb
new file mode 100644
index 00000000..c04c5cca
--- /dev/null
+++ b/modules/munin-node/templates/munin.conf.erb
@@ -0,0 +1,21 @@
+##
+### THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+### USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+dbdir   /var/lib/munin
+htmldir /var/www/munin
+logdir  /var/log/munin
+rundir  /var/run/munin
+tmpldir /etc/munin/templates
+graph_strategy cgi
+
+<%= out = ''
+    localinfo.keys.sort.each do |node|
+       out += '[ ' + node + ' ]
+    address ' + node + '
+
+'
+     end
+out
+%>