summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-11-01 14:32:41 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-11-01 14:32:41 -0200
commit01fc01e9a726e0fad10aa4285b858b2eb1062c0f (patch)
treea2f2da2f3fa52dfe7a427b3c0b69e55c164c34f0
parent156281ad6ed571effff9953eeba59c6359247d1a (diff)
parentdc99c8b7d36c3ee875a99dee931ad975be2a80f3 (diff)
downloadpuppet-mumble-01fc01e9a726e0fad10aa4285b858b2eb1062c0f.tar.gz
puppet-mumble-01fc01e9a726e0fad10aa4285b858b2eb1062c0f.tar.bz2
Merge branch 'master' of git://git.puppet.immerda.ch/module-mumble
-rw-r--r--manifests/init.pp6
1 files changed, 6 insertions, 0 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index e26d52e..633d63e 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -5,12 +5,14 @@
# * config_content: get content for central config file from
# this parameter. Useful for using templates
# * config_source: Source path for your config
+# * manage_munin: deploy munin plugins?
#
class mumble(
$config_content = false,
$config_source = [ "puppet:///modules/site_mumble/${::fqdn}/mumble-server.ini",
'puppet:///modules/site_mumble/mumble-server.ini',
'puppet:///modules/mumble/mumble-server.ini' ],
+ $manage_munin = false,
) {
package{'mumble-server':
ensure => installed,
@@ -34,4 +36,8 @@ class mumble(
source => $config_source,
}
}
+
+ if $manage_munin {
+ include mumble::munin
+ }
}