diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2010-02-01 11:54:54 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2010-02-01 11:54:54 -0200 |
| commit | 2e95f11a809a541c0ed852c7b2057dc53f49818d (patch) | |
| tree | cee76bfcf81aac6649811408d92f19c0ad75f285 /manifests/server.pp | |
| parent | 6ed1f8dfe6b16f148dde641482709958bc393815 (diff) | |
| parent | 292dd6b41adde8ca018e7c9b0d976420dc8905bc (diff) | |
Merge branch 'master' of git://labs.riseup.net/module_backupninja
Conflicts:
manifests/rdiff.pp
Diffstat (limited to 'manifests/server.pp')
| -rw-r--r-- | manifests/server.pp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/manifests/server.pp b/manifests/server.pp index 7cd5dd1..a0bcbf2 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -62,7 +62,7 @@ class backupninja::server { define sandbox( $user = false, $host = false, $installuser = true, $dir = false, $manage_ssh_dir = true, $ssh_dir = false, $authorized_keys_file = false, $key = false, $keytype = 'dss', $backupkeys = false, $uid = false, - $gid = "backupninjas", $backuptag = false) + $gid = "backupninjas", $backuptag = false, $nagios2_description = "backups") { $real_user = $user ? { @@ -95,9 +95,14 @@ class backupninja::server { default => $backuptag, } + $real_nagios2_description = $nagios2_description ? { + false => "backups", + default => $nagios2_description, + } + if $nagios_server { # configure a passive service check for backups - nagios2::passive_service { "backups-$real_host": nagios2_host_name => $real_host, nagios2_description => 'backups', servicegroups => "backups" } + nagios2::passive_service { "backups-${name}": nagios2_host_name => $real_host, nagios2_description => $real_nagios2_description, servicegroups => "backups" } } if !defined(File["$real_dir"]) { |