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/rdiff.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/rdiff.pp')
| -rw-r--r-- | manifests/rdiff.pp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp index 562d652..f750e23 100644 --- a/manifests/rdiff.pp +++ b/manifests/rdiff.pp @@ -26,7 +26,7 @@ define backupninja::rdiff( $vsinclude = false, $keep = 30, $sshoptions = false, $options = '--force', $ssh_dir_manage = true, $ssh_dir = false, $authorized_keys_file = false, $installuser = true, $installkey = true, $key = false, $backuptag = false, $home = false, $backupkeytype = "rsa", $backupkeystore = false, $extras = false, - $subfolder = 'rdiff-backup') + $nagios2_description = 'backups', $subfolder = 'rdiff-backup') { include backupninja::client::rdiff_backup @@ -50,6 +50,7 @@ define backupninja::rdiff( manage_ssh_dir => $ssh_dir_manage, ssh_dir => $ssh_dir, key => $key, authorized_keys_file => $authorized_keys_file, installuser => $installuser, backuptag => $real_backuptag, keytype => $backupkeytype, backupkeys => $backupkeystore, + nagios2_description => $nagios2_description } backupninja::client::key |