Commit 60931e1d authored by Jerome Charaoui's avatar Jerome Charaoui

Set proper defaults for $ssh_dir and $authorized_keys_file, no reason to use false

parent cfd59936
......@@ -88,8 +88,8 @@ define backupninja::duplicity( $order = 90,
$backupkeydestname = $backupninja::keydestname,
# options to backupninja server sandbox
$ssh_dir_manage = true,
$ssh_dir = false,
$authorized_keys_file = false,
$ssh_dir = "${destdir}/.ssh",
$authorized_keys_file = 'authorized_keys',
$installuser = true,
$backuptag = false,
# key options
......
......@@ -25,7 +25,7 @@ define backupninja::rdiff(
$include = [ "/var/spool/cron/crontabs", "/var/backups", "/etc", "/root",
"/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, $keymanage = $backupninja::keymanage, $key = false,
$ssh_dir = "${home}/.ssh", $authorized_keys_file = 'authorized_keys', $installuser = true, $keymanage = $backupninja::keymanage, $key = false,
$backuptag = false, $backupkeytype = $backupninja::keytype, $backupkeystore = $backupninja::keystore,
$extras = false, $nagios_description = 'backups')
{
......
......@@ -4,7 +4,7 @@
define backupninja::rsync(
$order = 90, $ensure = present,
$user = false, $home = "/home/${user}-${name}", $host = false,
$ssh_dir_manage = true, $ssh_dir = false, $authorized_keys_file = false,
$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, $extras = false,
$nagios_description = 'backups', $subfolder = 'rsync',
......
......@@ -57,7 +57,7 @@ class backupninja::server (
# get created on the server
define sandbox(
$user = $name, $host = $::fqdn, $installuser = true, $dir, $manage_ssh_dir = true,
$ssh_dir = "${backupninja::server::backupdir}/${::fqdn}/.ssh", $authorized_keys_file = 'authorized_keys', $key = false, $keytype = 'dss', $backupkeys = "${fileserver}/keys/backupkeys", $uid = false,
$ssh_dir = "${dir}/.ssh", $authorized_keys_file = 'authorized_keys', $key = false, $keytype = 'dss', $backupkeys = "${fileserver}/keys/backupkeys", $uid = false,
$gid = "backupninjas", $backuptag = "backupninja-${::fqdn}", $nagios_description = 'backups')
{
......
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