diff options
| author | Micah Anderson <micah@riseup.net> | 2009-12-22 19:29:23 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2009-12-22 19:29:23 -0500 |
| commit | 42c94b4fad526b25852c7bcaf053f441bac38c9e (patch) | |
| tree | 89a8da279ba7190a350ade72bc52cda90362c4b7 /manifests/init.pp | |
| parent | 577ff440b791ab67de77b20440b5e385fe1c9572 (diff) | |
| parent | 76352415fec5c2ab6975e3a8843dd4983f7cae6a (diff) | |
Merge commit '76352415fec5c2ab6975e3a8843dd4983f7cae6a'
Conflicts:
README
lib/facter/acpi_available.rb
lib/facter/interfaces.rb
lib/facter/munin_interfaces.rb
manifests/client.pp
manifests/host.pp
manifests/init.pp
manifests/plugin.pp
plugins/facter/interfaces.rb
templates/defaultclient.erb
templates/munin-node.conf.Debian.lenny
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 4a049a4..578c4bb 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,17 +1,20 @@ +# +# munin module # 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. - -# the port is a parameter so vservers can share IP addresses and still be happy - -# Define where the individual nodes' configs are stored -$NODESDIR="${module_dir_path}/munin/nodes" - -module_dir { [ "munin", "munin/nodes", "munin/plugins" ]: } - -import "host.pp" -import "client.pp" -import "plugin.pp" - -include assert_lsbdistcodename +# +# Copyright 2008, Puzzle ITC GmbH +# Marcel Härry haerry+puppet(at)puzzle.ch +# Simon Josi josi+puppet(at)puzzle.ch +# +# This program is free software; you can redistribute +# it and/or modify it under the terms of the GNU +# General Public License version 3 as published by +# the Free Software Foundation. +# +# the port is a parameter so vservers can share +# IP addresses and still be happy +class munin { + module_dir { [ "munin", "munin/nodes", "munin/plugins" ]: } +} |