diff options
| author | Marcel Haerry <haerry@puzzle.ch> | 2011-08-04 10:22:48 +0200 |
|---|---|---|
| committer | Marcel Haerry <haerry@puzzle.ch> | 2011-08-04 10:22:48 +0200 |
| commit | 447041b01494690975d078776a85f4a3fd4e64fa (patch) | |
| tree | 0d09932e8466de8208144aa034de401398151ca6 /manifests/init.pp | |
| parent | 553fbe3e1d3c6865172c1db8cf93d69fb936dc18 (diff) | |
| parent | eb953716cd545f86972e85d983b5862c194f5aed (diff) | |
merge with immerda/master
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index e5a92af..bae83a4 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -2,21 +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 -modules_dir { [ "munin", "munin/nodes", "munin/plugins" ]: } - -case $operatingsystem { - debian,ubuntu: { include assert_lsbdistcodename } +class munin { + include common::moduledir + module_dir { [ "munin", "munin/nodes", "munin/plugins" ]: } } |