diff options
| author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2010-02-09 09:40:19 -0500 |
|---|---|---|
| committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2011-10-12 15:14:56 -0400 |
| commit | 3f1417341b8357890997bc1a5157e19094ce9a2a (patch) | |
| tree | c91f8f024d7c83335606585a940c9bd327f7c618 | |
| parent | 8d158fdece3fe68244a069fad0b91935e690a7aa (diff) | |
update nagios object definitions to fit latest nagios module
| -rw-r--r-- | manifests/server.pp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/manifests/server.pp b/manifests/server.pp index a0bcbf2..27ceb59 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -23,13 +23,9 @@ class backupninja::server { mode => 0710, owner => root, group => "backupninjas" } - if $nagios_server { + if $use_nagios { - if !defined(Package["nsca"]) { - package { "nsca": - ensure => installed; - } - } + include nagios::nsca::client file { "/usr/local/bin/checkbackups": ensure => "present", @@ -100,9 +96,9 @@ class backupninja::server { default => $nagios2_description, } - if $nagios_server { + if $use_nagios { # configure a passive service check for backups - nagios2::passive_service { "backups-${name}": nagios2_host_name => $real_host, nagios2_description => $real_nagios2_description, servicegroups => "backups" } + nagios::service::passive { $nagios2_description: } } if !defined(File["$real_dir"]) { |