Merge remote-tracking branch 'shared/master' into leap_master

1 files changed, 10 insertions, 2 deletions

diff --git a/manifests/command/imap_pop3.pp b/manifests/command/imap_pop3.pp
index 3735136..42e4092 100644
--- a/manifests/command/imap_pop3.pp
+++ b/manifests/command/imap_pop3.pp
@@ -1,6 +1,8 @@
+# manage mail checks
 class nagios::command::imap_pop3 {
-  case $operatingsystem {
-    debian,ubuntu: { }  # Debian/Ubuntu already define those checks
+  require ::nagios::plugins::mail_login
+  case $::operatingsystem {
+    'Debian','Ubuntu': { }  # Debian/Ubuntu already define those checks
     default: {
       nagios_command {
         'check_imap':
@@ -17,6 +19,12 @@ class nagios::command::imap_pop3 {
     'check_pop3_ssl':
       command_line => '$USER1$/check_pop -H $ARG1$ -p $ARG2$ -S';
     'check_managesieve':
+      command_line => '$USER1$/check_tcp -H $ARG1$ -p 4190';
+    'check_managesieve_legacy':
       command_line => '$USER1$/check_tcp -H $ARG1$ -p 2000';
+    'check_imap_login':
+      command_line => '$USER1$/check_imap_login -s -H $ARG1$ -u $ARG2$ -p $ARG3$ -w $ARG4$ -c $ARG5$';
+    'check_pop3_login':
+      command_line => '$USER1$/check_pop3_login -s -H $ARG1$ -u $ARG2$ -p $ARG3$ -w $ARG4$ -c $ARG5$';
   }
 }