diff options
author | mh <mh@immerda.ch> | 2013-01-02 17:51:29 +0100 |
---|---|---|
committer | mh <mh@immerda.ch> | 2013-01-02 17:51:29 +0100 |
commit | 2b2268702938453bcece9ebe6070c03929910f8a (patch) | |
tree | f7ddfdfaf2430b19dcb7f89b3c16ccf4321976de /manifests/command/smtp.pp | |
parent | df358dcf15d26ba59b59f686ceee4b07b3aed7dd (diff) | |
parent | a2a80093d42b7e9eec9d2af3c66138f7ceaf9ed6 (diff) |
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
Diffstat (limited to 'manifests/command/smtp.pp')
-rw-r--r-- | manifests/command/smtp.pp | 24 |
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$'; } } |