Commit 85de5c58 authored by Jerome Charaoui's avatar Jerome Charaoui

Adjust $backuptag default value of handlers, removes $real_backuptag

parent 60931e1d
......@@ -91,7 +91,7 @@ define backupninja::duplicity( $order = 90,
$ssh_dir = "${destdir}/.ssh",
$authorized_keys_file = 'authorized_keys',
$installuser = true,
$backuptag = false,
$backuptag = "backupninja-${::fqdn}",
# key options
$createkey = false,
$keymanage = $backupninja::keymanage ) {
......
......@@ -26,7 +26,7 @@ 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 = "${home}/.ssh", $authorized_keys_file = 'authorized_keys', $installuser = true, $keymanage = $backupninja::keymanage, $key = false,
$backuptag = false, $backupkeytype = $backupninja::keytype, $backupkeystore = $backupninja::keystore,
$backuptag = "backupninja-${::fqdn}", $backupkeytype = $backupninja::keytype, $backupkeystore = $backupninja::keystore,
$extras = false, $nagios_description = 'backups')
{
# install client dependencies
......@@ -37,17 +37,13 @@ define backupninja::rdiff(
case $type {
'remote': {
case $host { false: { err("need to define a host for remote backups!") } }
$real_backuptag = $backuptag ? {
false => "backupninja-$fqdn",
default => $backuptag
}
backupninja::server::sandbox
{
"${user}-${name}": user => $user, host => $fqdn, dir => $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,
backuptag => $backuptag, keytype => $backupkeytype, backupkeys => $backupkeystore,
nagios_description => $nagios_description
}
......
......@@ -5,7 +5,7 @@ define backupninja::rsync(
$order = 90, $ensure = present,
$user = false, $home = "/home/${user}-${name}", $host = false,
$ssh_dir_manage = true, $ssh_dir = "${home}/.ssh", $authorized_keys_file = 'authorized_keys',
$installuser = true, $keymanage = $backupninja::keymanage, $key = false, $backuptag = false,
$installuser = true, $keymanage = $backupninja::keymanage, $key = false, $backuptag = "backupninja-${::fqdn}",
$backupkeytype = $backupninja::keytype, $backupkeystore = $backupninja::keystore, $extras = false,
$nagios_description = 'backups', $subfolder = 'rsync',
......@@ -41,11 +41,6 @@ define backupninja::rsync(
'remote': {
case $host { false: { err("need to define a host for remote backups!") } }
$real_backuptag = $backuptag ? {
false => "backupninja-$fqdn",
default => $backuptag,
}
$directory = "${home}/${subfolder}/"
backupninja::server::sandbox { "${user}-${name}":
......@@ -57,7 +52,7 @@ define backupninja::rsync(
key => $key,
authorized_keys_file => $authorized_keys_file,
installuser => $installuser,
backuptag => $real_backuptag,
backuptag => $backuptag,
keytype => $backupkeytype,
backupkeys => $backupkeystore,
nagios_description => $nagios_description
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment