diff options
author | mh <mh@immerda.ch> | 2012-06-08 12:33:12 -0300 |
---|---|---|
committer | mh <mh@immerda.ch> | 2012-06-08 12:33:12 -0300 |
commit | 70af6cca4b8bd7ba6c6e287d827cc65098e22831 (patch) | |
tree | 55b142cb86104f16a4f72e234e3d8e8887969399 | |
parent | 52eecbba9c2bd90aca53b25711093769f863fabb (diff) | |
download | puppet-ejabberd-70af6cca4b8bd7ba6c6e287d827cc65098e22831.tar.gz puppet-ejabberd-70af6cca4b8bd7ba6c6e287d827cc65098e22831.tar.bz2 |
refactor things for >2.7
-rw-r--r-- | manifests/base.pp | 4 | ||||
-rw-r--r-- | manifests/init.pp | 15 | ||||
-rw-r--r-- | manifests/munin.pp | 10 | ||||
-rw-r--r-- | manifests/nagios.pp | 21 |
4 files changed, 23 insertions, 27 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 12dd9e7..4b9f035 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -4,8 +4,8 @@ class ejabberd::base { } file{'/etc/ejabberd/ejabberd.cfg': - source => [ "puppet:///modules/site-ejabberd/${fqdn}/ejabberd.cfg", - "puppet:///modules/site-ejabberd/ejabberd.cfg", + source => [ "puppet:///modules/site_ejabberd/${::fqdn}/ejabberd.cfg", + "puppet:///modules/site_ejabberd/ejabberd.cfg", "puppet:///modules/ejabberd/ejabberd.cfg" ], require => Package['ejabberd'], notify => Service['ejabberd'], diff --git a/manifests/init.pp b/manifests/init.pp index d8b9d44..91c8e1f 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -2,19 +2,24 @@ # Copyright (C) 2007 admin@immerda.ch # GPLv3 -class ejabberd { - case $operatingsystem { +class ejabberd( + $domains = $::fqdn, + $nagios_domain = hiera('ejabberd_nagios_domain', $::fqdn), + $nagios_user = hiera('ejabberd_nagios_user', 'nagios'), + $nagios_pwd = hiera('ejabberd_nagios_pwd','') +) { + case $::operatingsystem { default: { include ejabberd::base } } - if $use_nagios { + if hiera('use_nagios',false) { include ejabberd::nagios } - if $use_munin { + if hiera('use_munin',false) { include ejabberd::munin } - if $use_shorewall { + if hiera('use_shorewall',false) { include shorewall::rules::jabberserver } } diff --git a/manifests/munin.pp b/manifests/munin.pp index 1357e98..61d6432 100644 --- a/manifests/munin.pp +++ b/manifests/munin.pp @@ -1,14 +1,12 @@ class ejabberd::munin { - case $ejabberd_domains { - '': { $ejabberd_domains = $fqdn } - } - munin::plugin::deploy{'ejabberd_': - source => "ejabberd/munin/ejabberd_", + munin::plugin::deploy{'ejabberd_': + source => "ejabberd/munin/ejabberd_", ensure => absent, } + $domains = join($ejabberd::domains, ' ') munin::plugin{['ejabberd_users','ejabberd_connections','ejabberd_registrations']: require => Munin::Plugin::Deploy['ejabberd_'], ensure => 'ejabberd_', - config => "env.vhosts ${ejabberd_domains}\ntimeout 20\nuser root\ngroup root" + config => "env.vhosts ${domains}\ntimeout 20\nuser root\ngroup root" } } diff --git a/manifests/nagios.pp b/manifests/nagios.pp index 85a7b10..27df382 100644 --- a/manifests/nagios.pp +++ b/manifests/nagios.pp @@ -1,25 +1,18 @@ # manifests/nagios.pp class ejabberd::nagios { - case $jabber_nagios_domain { - '': { $jabber_nagios_domain = $fqdn } - } - nagios::service{ "jabber_${fqdn}": check_command => "check_jabber!${jabber_nagios_domain}" } + nagios::service{ "jabber_${::fqdn}": check_command => "check_jabber!${ejabberd::nagios_domain}" } @@nagios_command{ 'check_jabber_ssl': command_line => '$USER1$/check_jabber -S -p 5223 -H $ARG1$', } - nagios::service{ "jabber_ssl_${fqdn}": check_command => "check_jabber_ssl!${jabber_nagios_domain}" } + nagios::service{ "jabber_ssl_${::fqdn}": check_command => "check_jabber_ssl!${ejabberd::nagios_domain}" } @@nagios_command{ 'check_jabber_cert': command_line => '$USER1$/check_jabber -S -D 10 -p 5223 -H $ARG1$', } - nagios::service{ "jabber_cert_${fqdn}": check_command => "check_jabber_cert!${jabber_nagios_domain}" } - - case $jabber_nagios_user { - '': { $jabber_nagios_user = 'nagios' } - } + nagios::service{ "jabber_cert_${::fqdn}": check_command => "check_jabber_cert!${ejabberd::nagios_domain}" } @@nagios_command{ 'check_jabber_login': @@ -27,10 +20,10 @@ class ejabberd::nagios { require => Nagios::Plugin['check_jabber_login']; } - case $jabber_nagios_pwd { - '': { info("no \$jabber_nagios_pwd supplied for ${fqdn}! Can't test jabber login") } - default: { - nagios::service{ "jabber_login_${fqdn}": check_command => "check_jabber_login!${jabber_nagios_user}@${jabber_nagios_domain}!${jabber_nagios_pwd}" } + case $ejabberd::nagios_pwd { + '': { info("no \$ejabberd::nagios_pwd supplied for ${::fqdn}! Can't test jabber login") } + default: { + nagios::service{ "jabber_login_${::fqdn}": check_command => "check_jabber_login!${ejabberd::nagios_user}@${ejabberd::nagios_domain}!${ejabberd::nagios_pwd}" } } } } |