whitespace

diff --git a/manifests/base.pp b/manifests/base.pp
index d66c6887aeae37656e62b75992147f6d81270491..c415d19e6442c90e788bd2539095dff1c32f441f 100644 (file)
--- 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 0eb62267aebb03f00384240c622d61b388b28994..d8b9d4432cc2ef3035a96271fdee3893e9724e7d 100644 (file)
--- 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 89cb2fa3f981af91ab4df7004bb6aed578ecbfd2..928dd281eb0ae80a6dab46dcf495c1953bb98d6e 100644 (file)
--- 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}" }
     }
+  }
 }