diff options
author | varac <varacanero@zeromail.org> | 2016-03-01 11:59:10 +0100 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2016-03-01 11:59:10 +0100 |
commit | 53e2db13e5082f09fcee7d34ed83b3dfaef06e52 (patch) | |
tree | 3f082b3311d08140e29c9ca730cfa3c8061545a8 /manifests/command | |
parent | 70afab799b8cf720cd12bd225c1c2948fd1597ee (diff) | |
parent | c0dee4a2393e23b226e123a427898de94b342141 (diff) |
Merge remote-tracking branch 'shared/master' into leap_master
Diffstat (limited to 'manifests/command')
-rw-r--r-- | manifests/command/imap_pop3.pp | 12 | ||||
-rw-r--r-- | manifests/command/nrpe_timeout.pp | 8 |
2 files changed, 14 insertions, 6 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$'; } } diff --git a/manifests/command/nrpe_timeout.pp b/manifests/command/nrpe_timeout.pp index 3415566..799f2fc 100644 --- a/manifests/command/nrpe_timeout.pp +++ b/manifests/command/nrpe_timeout.pp @@ -1,11 +1,11 @@ class nagios::command::nrpe_timeout { nagios_command { 'check_nrpe_timeout': - command_line => '/usr/lib/nagios/plugins/check_nrpe -t $ARG1$ -H $HOSTADDRESS$ -c $ARG2$ -a $ARG3$' - } + command_line => '/usr/lib/nagios/plugins/check_nrpe -t $ARG1$ -H $HOSTADDRESS$ -c $ARG2$ -a $ARG3$', + require => Package['nagios-nrpe-server']; - nagios_command { 'check_nrpe_1arg_timeout': - command_line => '/usr/lib/nagios/plugins/check_nrpe -t $ARG1$ -H $HOSTADDRESS$ -c $ARG2$' + command_line => '/usr/lib/nagios/plugins/check_nrpe -t $ARG1$ -H $HOSTADDRESS$ -c $ARG2$', + require => Package['nagios-nrpe-server'] } } |