diff options
| author | Micah Anderson <micah@riseup.net> | 2011-03-25 00:01:54 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2011-03-25 00:01:54 -0400 |
| commit | 5218993abef2a8bf79278d4d84123843279735c5 (patch) | |
| tree | 8fe859ba86b83e4b9782ac19a37c89bf5cf5f0ba /manifests/init.pp | |
| parent | b3e29447187e289c60a4a9f7830032f1b10fae2f (diff) | |
| parent | e7d23dabf191c5416197af0b229fc90b94539405 (diff) | |
Merge commit 'e7d23dabf191c5416197af0b229fc90b94539405'
Conflicts:
manifests/client.pp
manifests/client/base.pp
manifests/client/darwin.pp
manifests/client/debian.pp
manifests/client/gentoo.pp
manifests/client/openbsd.pp
manifests/client/package.pp
manifests/host.pp
manifests/init.pp
manifests/plugin.pp
manifests/plugin/scriptpaths.pp
manifests/plugins/interfaces.pp
manifests/plugins/linux.pp
manifests/plugins/vserver.pp
manifests/register.pp
manifests/register_snmp.pp
manifests/remoteplugin.pp
manifests/snmp_collector.pp
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 578c4bb..bae83a4 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -2,19 +2,20 @@ # munin module # munin.pp - everything a sitewide munin installation needs # Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at> -# +# # 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 +# 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 +# the port is a parameter so vservers can share # IP addresses and still be happy class munin { + include common::moduledir module_dir { [ "munin", "munin/nodes", "munin/plugins" ]: } } |