diff options
| -rw-r--r-- | files/.git_placeholder | 1 | ||||
| -rw-r--r-- | manifests/client.pp | 6 | ||||
| -rw-r--r-- | manifests/host.pp | 2 | ||||
| -rw-r--r-- | manifests/init.pp | 6 | ||||
| l--------- | templates/munin-node.conf.Debian.feisty | 1 |
5 files changed, 10 insertions, 6 deletions
diff --git a/files/.git_placeholder b/files/.git_placeholder new file mode 100644 index 0000000..89cb1fe --- /dev/null +++ b/files/.git_placeholder @@ -0,0 +1 @@ +# file needed for git - don't remove it diff --git a/manifests/client.pp b/manifests/client.pp index c81e6f4..2d13d24 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -51,7 +51,6 @@ class munin::client { xen0: { include munin::plugins::dom0 } xenu: { include munin::plugins::domU } } - } define munin::register() @@ -66,6 +65,7 @@ define munin::register() @@file { "${NODESDIR}/${name}_${munin_port_real}": ensure => present, content => template("munin/defaultclient.erb"), + tag => 'munin', } } @@ -74,7 +74,7 @@ define munin::register_snmp() @@file { "munin_snmp_${name}": path => "${NODESDIR}/${name}", ensure => present, content => template("munin/snmpclient.erb"), - tag => 'munin', + tag => 'munin', } } @@ -191,5 +191,3 @@ class munin::client::centos munin::register { $fqdn: } } - - diff --git a/manifests/host.pp b/manifests/host.pp index 4625ba9..74492b1 100644 --- a/manifests/host.pp +++ b/manifests/host.pp @@ -12,7 +12,7 @@ class munin::host dir => $NODESDIR, header => "/etc/munin/munin.conf.header", } - + file { ["/var/log/munin-update.log", "/var/log/munin-limits.log", "/var/log/munin-graph.log", "/var/log/munin-html.log"]: ensure => present, diff --git a/manifests/init.pp b/manifests/init.pp index 9c4b1de..e1f62a6 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,7 +1,12 @@ # munin.pp - everything a sitewide munin installation needs # Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at> # See LICENSE for the full license granted to you. +<<<<<<< HEAD:manifests/init.pp +# adapted by Puzzle ITC - haerry+puppet(at)puzzle.ch +# +======= +>>>>>>> immerda/master:manifests/init.pp # the port is a parameter so vservers can share IP addresses and still be happy # Define where the individual nodes' configs are stored @@ -16,4 +21,3 @@ import "plugin.pp" case $operatingsystem { debian,ubuntu: { include assert_lsbdistcodename } } - diff --git a/templates/munin-node.conf.Debian.feisty b/templates/munin-node.conf.Debian.feisty new file mode 120000 index 0000000..e0646b9 --- /dev/null +++ b/templates/munin-node.conf.Debian.feisty @@ -0,0 +1 @@ +munin-node.conf.Debian.etch
\ No newline at end of file |