Branching the definition for smtp, imap and pop3 commands

2 files changed, 33 insertions, 48 deletions

diff --git a/manifests/command/imap_pop3.pp b/manifests/command/imap_pop3.pp
index 082a360..3735136 100644
--- a/manifests/command/imap_pop3.pp
+++ b/manifests/command/imap_pop3.pp
@@ -1,31 +1,22 @@
 class nagios::command::imap_pop3 {
   case $operatingsystem {
-      debian,ubuntu: {
-        nagios_command {
-          'check_imap_ssl':
-            command_line => '$USER1$/check_imap -H $ARG1$ -p $ARG2$ -S';
-          'check_pop3':
-            command_line => '$USER1$/check_pop -H $ARG1$ -p $ARG2$';
-          'check_pop3_ssl':
-            command_line => '$USER1$/check_pop -H $ARG1$ -p $ARG2$ -S';
-          'check_managesieve':
-            command_line => '$USER1$/check_tcp -H $ARG1$ -p 2000';
-        }
-      }
-      default: {
-        nagios_command {
-          'check_imap':
-            command_line => '$USER1$/check_imap -H $ARG1$ -p $ARG2$';
-          'check_imap_ssl':
-            command_line => '$USER1$/check_imap -H $ARG1$ -p $ARG2$ -S';
-          'check_pop3':
-            command_line => '$USER1$/check_pop -H $ARG1$ -p $ARG2$';
-          'check_pop3_ssl':
-            command_line => '$USER1$/check_pop -H $ARG1$ -p $ARG2$ -S';
-          'check_managesieve':
-            command_line => '$USER1$/check_tcp -H $ARG1$ -p 2000';
-        }
+    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':
+      command_line => '$USER1$/check_pop -H $ARG1$ -p $ARG2$';
+    'check_pop3_ssl':
+      command_line => '$USER1$/check_pop -H $ARG1$ -p $ARG2$ -S';
+    'check_managesieve':
+      command_line => '$USER1$/check_tcp -H $ARG1$ -p 2000';
+  }
 }
diff --git a/manifests/command/smtp.pp b/manifests/command/smtp.pp
index a887e0a..29d97f8 100644
--- a/manifests/command/smtp.pp
+++ b/manifests/command/smtp.pp
@@ -1,28 +1,22 @@
 class nagios::command::smtp {
   case $operatingsystem {
-      debian,ubuntu: {
-        nagios_command {
-          'check_smtp_tls':
-            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_cert':
-            command_line => '$USER1$/check_ssmtp -H $ARG1$ -p $ARG2$ -S -D $ARG3$';
-        }
-      }
-      default: {
-        nagios_command {
-          'check_smtp':
-            command_line => '$USER1$/check_smtp -H $ARG1$ -p $ARG2$';
-          'check_smtp_tls':
-            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';
-          'check_ssmtp_cert':
-            command_line => '$USER1$/check_ssmtp -H $ARG1$ -p $ARG2$ -S -D $ARG3$';
-        }
+    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';
+    'check_smtp_cert':
+       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$';
   }
 }