diff options
Diffstat (limited to 'manifests/server.pp')
-rw-r--r-- | manifests/server.pp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/manifests/server.pp b/manifests/server.pp index 6ed87c8..f702056 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -38,17 +38,13 @@ class backupninja::server { } } - 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", - source => "puppet://$servername/backupninja/checkbackups.pl", + source => "puppet:///modules/backupninja/checkbackups.pl", mode => 0755, owner => root, group => root, } @@ -114,9 +110,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(Backupninja_server_realize["${fqdn}@${real_host}"]) { |