diff options
| author | mh <mh@immerda.ch> | 2015-12-09 19:51:57 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2015-12-09 19:51:57 +0100 |
| commit | 6cd3270ccfd806bcc8097be4f6982c6dccc6a4aa (patch) | |
| tree | 6c3a56aac66bf1cdce128d89550151a11cdb21c2 | |
| parent | 5589fbd8bf18a5c5a499b36b8ab0e2b7a81a5e50 (diff) | |
| parent | 993b624bd14dc5ef88847b11abc06d2b708c23b6 (diff) | |
Merge remote-tracking branch 'shared/master'
| -rw-r--r-- | manifests/command/nrpe_timeout.pp | 8 | ||||
| -rw-r--r-- | templates/nrpe/nrpe.cfg | 2 |
2 files changed, 5 insertions, 5 deletions
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'] } } diff --git a/templates/nrpe/nrpe.cfg b/templates/nrpe/nrpe.cfg index 5368bc8..2ae2d71 100644 --- a/templates/nrpe/nrpe.cfg +++ b/templates/nrpe/nrpe.cfg @@ -75,7 +75,7 @@ nrpe_group=nagios <%- if nagios_nrpe_allowed_hosts.to_s.empty? then %> allowed_hosts=127.0.0.1 <%- else %> -allowed_host=127.0.0.1,<%= nagios_nrpe_allowed_hosts %> +allowed_hosts=127.0.0.1,<%= nagios_nrpe_allowed_hosts %> <%- end %> # COMMAND ARGUMENT PROCESSING |