diff options
| author | varac <varacanero@zeromail.org> | 2015-04-19 22:17:08 +0000 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-04-19 22:17:08 +0000 |
| commit | c476d34e348fdb2fa77458d60432e5cd92e9a3be (patch) | |
| tree | fff0e3fa3835d5b5a3b9285347806ccd9a0403b1 | |
| parent | 0b20e1e0fd001cb0b688c6bf6971c8e7c3f743c6 (diff) | |
| parent | df559db6f6cbe65393b2ebcc571ebdaed06e0cf3 (diff) | |
Merge branch 'unquote_booleans' into 'master'
Unquote booleans
Some variables and if blocks use quoted booleans when we should be using the native boolean type.
Also, when working on this, I saw an issue with a mistyped variable in nagios::service so I fixed it.
This is a followup of: https://labs.riseup.net/code/issues/4093
See merge request !9
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | manifests/service.pp | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -73,7 +73,7 @@ nagios server define a service that will check the NRPE command 'check_cpu' on the current node: nagios::service { 'CPU Usage': - use_nrpe => 'true', + use_nrpe => true, check_command => "check_cpu", nrpe_args => "-t 60" } diff --git a/manifests/service.pp b/manifests/service.pp index 134d1f7..3e8f6c8 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -27,11 +27,11 @@ define nagios::service ( } if $ensure != 'absent' { - if $check_comand == 'absent' { + if $check_command == 'absent' { fail("Must pass a check_command to ${name} if it should be present") } - if ($use_nrpe == 'true') { - include nagios::command::nrpe_timeout + if ($use_nrpe == true) { + include nagios::command::nrpe_timeout if ($nrpe_args != '') { $real_check_command = "check_nrpe_timeout!$nrpe_timeout!$check_command!\"$nrpe_args\"" |