diff options
Diffstat (limited to 'manifests/rdiff.pp')
| -rw-r--r-- | manifests/rdiff.pp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp index 587c02d..847c319 100644 --- a/manifests/rdiff.pp +++ b/manifests/rdiff.pp @@ -25,7 +25,8 @@ define backupninja::rdiff( "/home", "/usr/local/*bin", "/var/lib/dpkg/status*" ], $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, $nagios2_description = 'backups') + $backuptag = false, $home = false, $backupkeytype = "rsa", $backupkeystore = false, $extras = false, + $nagios2_description = 'backups', $subfolder = 'rdiff-backup') { include backupninja::client::rdiff_backup @@ -33,7 +34,7 @@ define backupninja::rdiff( 'remote': { case $host { false: { err("need to define a host for remote backups!") } } $real_backuptag = $backuptag ? { - false => "backupninja-$host", + false => "backupninja-$fqdn", default => $backuptag } @@ -41,11 +42,11 @@ define backupninja::rdiff( false => "/home/${user}-${name}", default => $home, } - $directory = "$real_home/rdiff-backup/" + $directory = "${real_home}/${subfolder}/" backupninja::server::sandbox { - "${user}-${name}": user => $user, host => $fqdn, dir => $real_home, + "${user}-${name}": user => $user, host => $host, dir => $real_home, 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, |