diff options
Diffstat (limited to 'manifests/duplicity.pp')
| -rw-r--r-- | manifests/duplicity.pp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/manifests/duplicity.pp b/manifests/duplicity.pp index 8313eb9..fa68324 100644 --- a/manifests/duplicity.pp +++ b/manifests/duplicity.pp @@ -82,11 +82,11 @@ define backupninja::duplicity( $order = 90, $destuser = false, $desturl = false, # configs to backupninja client - $backupkeystore = false, - $backupkeystorefspath = '', - $backupkeytype = "rsa", - $backupkeydest = false, - $backupkeydestname = false, + $backupkeystore = $backupninja::keystore, + $backupkeystorefspath = $backupninja::keystorefspath, + $backupkeytype = $backupninja::keytype, + $backupkeydest = $backupninja::keydest, + $backupkeydestname = $backupninja::keydestname, # options to backupninja server sandbox $ssh_dir_manage = true, $ssh_dir = false, @@ -100,9 +100,6 @@ define backupninja::duplicity( $order = 90, # install client dependencies ensure_resource('package', 'duplicity', {'ensure' => $ensure_duplicity_version}) - # the client with configs for this machine - include backupninja::client::duplicity - case $desthost { false: { err("need to define a destination host for remote backups!") } } case $destdir { false: { err("need to define a destination directory for remote backups!") } } case $password { false: { err("a password is necessary either to unlock the GPG key, or for symmetric encryption!") } } @@ -135,13 +132,13 @@ define backupninja::duplicity( $order = 90, } # the backupninja rule for this duplicity backup - file { "${backupninja::client::defaults::configdir}/${order}_${name}.dup": + file { "${backupninja::configdir}/${order}_${name}.dup": ensure => $ensure, content => template('backupninja/dup.conf.erb'), owner => root, group => root, mode => 0600, - require => File["${backupninja::client::defaults::configdir}"] + require => File["${backupninja::configdir}"] } } |