Merge remote-tracking branch 'riseup/master' into HEAD

Conflicts:
	manifests/apache.pp
	manifests/base.pp
	manifests/defaults/templates.pp
	manifests/defaults/vars.pp
	manifests/init.pp
	manifests/irc_bot.pp
	manifests/nsca/client.pp
	manifests/nsca/server.pp
	manifests/service.pp
	manifests/service/mysql.pp
	templates/irc_bot/nsa.cfg.erb

1 files changed, 16 insertions, 8 deletions

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$';
   }
 }