summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2010-11-04 22:15:37 +0100
committermh <mh@immerda.ch>2010-11-04 22:15:37 +0100
commit016a81b1d9c1cf68e23008b7d6c4c3e0de576edf (patch)
tree4bf35d5f0782bb6c336eaca50980cde4a70ada8a
parentfdea7be65761b5023d31ec9f8e3bafdf63900f13 (diff)
downloadpuppet-ejabberd-016a81b1d9c1cf68e23008b7d6c4c3e0de576edf.tar.gz
puppet-ejabberd-016a81b1d9c1cf68e23008b7d6c4c3e0de576edf.tar.bz2
whitespace
-rw-r--r--manifests/base.pp34
-rw-r--r--manifests/init.pp24
-rw-r--r--manifests/nagios.pp40
3 files changed, 49 insertions, 49 deletions
diff --git a/manifests/base.pp b/manifests/base.pp
index d66c688..c415d19 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -1,21 +1,21 @@
class ejabberd::base {
- package{'ejabberd':
- ensure => installed,
- }
+ package{'ejabberd':
+ ensure => installed,
+ }
- file{'/etc/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'],
- owner => ejabberd, group => ejabberd, mode => 0640;
- }
+ file{'/etc/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'],
+ owner => ejabberd, group => ejabberd, mode => 0640;
+ }
- service{ejabberd:
- ensure => running,
- enable => true,
- hasstatus => true, #fixme!
- require => Package[ejabberd],
- }
+ service{'ejabberd':
+ ensure => running,
+ enable => true,
+ hasstatus => true,
+ require => Package[ejabberd],
+ }
}
diff --git a/manifests/init.pp b/manifests/init.pp
index 0eb6226..d8b9d44 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -3,18 +3,18 @@
# GPLv3
class ejabberd {
- case $operatingsystem {
- default: { include ejabberd::base }
- }
- if $use_nagios {
- include ejabberd::nagios
- }
+ case $operatingsystem {
+ default: { include ejabberd::base }
+ }
+ if $use_nagios {
+ include ejabberd::nagios
+ }
- if $use_munin {
- include ejabberd::munin
- }
+ if $use_munin {
+ include ejabberd::munin
+ }
- if $use_shorewall {
- include shorewall::rules::jabberserver
- }
+ if $use_shorewall {
+ include shorewall::rules::jabberserver
+ }
}
diff --git a/manifests/nagios.pp b/manifests/nagios.pp
index 89cb2fa..928dd28 100644
--- a/manifests/nagios.pp
+++ b/manifests/nagios.pp
@@ -1,29 +1,29 @@
# 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}" }
+ case $jabber_nagios_domain {
+ '': { $jabber_nagios_domain = $fqdn }
+ }
+ nagios::service{ "jabber_${fqdn}": check_command => "check_jabber!${jabber_nagios_domain}" }
- case $jabber_nagios_user {
- '': { $jabber_nagios_user = 'nagios' }
- }
+ case $jabber_nagios_user {
+ '': { $jabber_nagios_user = 'nagios' }
+ }
- nagios::plugin{'check_jabber_login':
- source => 'ejabberd/nagios/check_jabber_login';
- }
+ nagios::plugin{'check_jabber_login':
+ source => 'ejabberd/nagios/check_jabber_login';
+ }
- @@nagios_command{
- 'check_jabber_login':
- command_line => '$USER1$/check_jabber_login $ARG1$ $ARG2$',
- require => Nagios::Plugin['check_jabber_login'];
- }
+ @@nagios_command{
+ 'check_jabber_login':
+ command_line => '$USER1$/check_jabber_login $ARG1$ $ARG2$',
+ 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 $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}" }
}
+ }
}