Merge branch 'master' of git://git.puppet.immerda.ch/module-ejabberdHEADmaster

Conflicts:
	manifests/base.pp

1 files changed, 15 insertions, 5 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index d8b9d44..8c21344 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -2,19 +2,29 @@
 # Copyright (C) 2007 admin@immerda.ch
 # GPLv3
 
-class ejabberd {
-  case $operatingsystem {
+# Manage an ejabberd server
+class ejabberd(
+  $domains          = $::fqdn,
+  $config_content   = false,
+  $nagios_domain    = $::fqdn,
+  $nagios_user      = 'nagios',
+  $nagios_pwd       = '',
+  $manage_nagios    = false,
+  $manage_munin     = false,
+  $manage_shorewall = false
+) {
+  case $::operatingsystem {
     default: { include ejabberd::base }
   }
-  if $use_nagios {
+  if $manage_nagios {
     include ejabberd::nagios
   }
 
-  if $use_munin {
+  if $manage_munin {
     include ejabberd::munin
   }
 
-  if $use_shorewall {
+  if $manage_shorewall {
     include shorewall::rules::jabberserver
   }
 }