Merge branch 'master' into riseup

2 files changed, 27 insertions, 11 deletions

diff --git a/manifests/command/imap_pop3.pp b/manifests/command/imap_pop3.pp
index 174b09c..3735136 100644
--- a/manifests/command/imap_pop3.pp
+++ b/manifests/command/imap_pop3.pp
@@ -1,7 +1,15 @@
 class nagios::command::imap_pop3 {
-  nagios_command{
-    'check_imap':
-      command_line => '$USER1$/check_imap -H $ARG1$ -p $ARG2$';
+  case $operatingsystem {
+    debian,ubuntu: { }  # Debian/Ubuntu already define those checks
+    default: {
+      nagios_command {
+        'check_imap':
+          command_line => '$USER1$/check_imap -H $ARG1$ -p $ARG2$';
+      }
+    }
+  }
+
+  nagios_command {
     'check_imap_ssl':
       command_line => '$USER1$/check_imap -H $ARG1$ -p $ARG2$ -S';
     'check_pop3':
diff --git a/manifests/command/smtp.pp b/manifests/command/smtp.pp
index 04f8543..29d97f8 100644
--- a/manifests/command/smtp.pp
+++ b/manifests/command/smtp.pp
@@ -1,14 +1,22 @@
 class nagios::command::smtp {
-  nagios_command{
-    'check_smtp':
-      command_line => '$USER1$/check_smtp -H $ARG1$ -p $ARG2$';
+  case $operatingsystem {
+    debian,ubuntu: { }  # Debian/Ubuntu already define those checks
+    default: {
+      nagios_command {
+        'check_smtp':
+           command_line => '$USER1$/check_smtp -H $ARG1$ -p $ARG2$';
+        'check_ssmtp':
+           command_line => '$USER1$/check_ssmtp -H $ARG1$ -p $ARG2$ -S';
+      }
+    }
+  }
+
+  nagios_command {
     'check_smtp_tls':
-      command_line => '$USER1$/check_smtp -H $ARG1$ -p $ARG2$ -S';
+       command_line => '$USER1$/check_smtp -H $ARG1$ -p $ARG2$ -S';
     'check_smtp_cert':
-      command_line => '$USER1$/check_smtp -H $ARG1$ -p $ARG2$ -S -D $ARG3$';
-    'check_ssmtp':
-      command_line => '$USER1$/check_ssmtp -H $ARG1$ -p $ARG2$ -S';
+       command_line => '$USER1$/check_smtp -H $ARG1$ -p $ARG2$ -S -D $ARG3$';
     'check_ssmtp_cert':
-      command_line => '$USER1$/check_ssmtp -H $ARG1$ -p $ARG2$ -S -D $ARG3$';
+       command_line => '$USER1$/check_ssmtp -H $ARG1$ -p $ARG2$ -S -D $ARG3$';
   }
 }