diff options
| author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-05-08 12:53:13 -0400 |
|---|---|---|
| committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-05-08 12:53:13 -0400 |
| commit | 60931e1d8b25cdf99bbfdd5c9bed8f5d16709928 (patch) | |
| tree | 99ac60c16aa6dec1fb3549c8f742c68337eea245 | |
| parent | cfd5993600950d200d46e1884e4b0c898c023e60 (diff) | |
| download | puppet-backupninja-60931e1d8b25cdf99bbfdd5c9bed8f5d16709928.tar.gz puppet-backupninja-60931e1d8b25cdf99bbfdd5c9bed8f5d16709928.tar.bz2 | |
Set proper defaults for $ssh_dir and $authorized_keys_file, no reason to use false
| -rw-r--r-- | manifests/duplicity.pp | 4 | ||||
| -rw-r--r-- | manifests/rdiff.pp | 2 | ||||
| -rw-r--r-- | manifests/rsync.pp | 2 | ||||
| -rw-r--r-- | manifests/server.pp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/manifests/duplicity.pp b/manifests/duplicity.pp index 76cff8d..cd54443 100644 --- a/manifests/duplicity.pp +++ b/manifests/duplicity.pp @@ -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 diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp index 8395460..4292c9c 100644 --- a/manifests/rdiff.pp +++ b/manifests/rdiff.pp @@ -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') { diff --git a/manifests/rsync.pp b/manifests/rsync.pp index 8fbe639..6f0ca74 100644 --- a/manifests/rsync.pp +++ b/manifests/rsync.pp @@ -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', diff --git a/manifests/server.pp b/manifests/server.pp index 2ab0f49..af7baf9 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -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') { |