Merge branch 'ferm'

diff --git a/files/etc/puppet/puppet.conf b/files/etc/puppet/puppet.conf
index 1a839469124eb683eca6768b2c8a80e44dee3990..8ffabccfbe1c14b202fd463770b8f70380433d03 100644 (file)
--- 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 4525e5063447298d91d64402b288cbe2e5c6d2df..b10857915f571391132bd8e4b80fc6636d571344 100644 (file)
--- 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 (file)
index 0000000..c7eb80b
--- /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 (file)
index 0000000..c04c5cc
--- /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
+%>