Commit 70cae2f7 authored by Silvio Rhatto's avatar Silvio Rhatto
Browse files

Adding missing keystore and backupkeystore parameters at rdiff and dup definitions

parent c823b286
...@@ -116,6 +116,7 @@ define backupninja::duplicity( $order = 90, ...@@ -116,6 +116,7 @@ define backupninja::duplicity( $order = 90,
host => $desthost, host => $desthost,
installkey => $installkey, installkey => $installkey,
keytype => $backupkeytype, keytype => $backupkeytype,
keystore => $backupkeystore,
} }
# the backupninja rule for this duplicity backup # the backupninja rule for this duplicity backup
......
...@@ -25,7 +25,7 @@ define backupninja::rdiff( ...@@ -25,7 +25,7 @@ define backupninja::rdiff(
"/home", "/usr/local/*bin", "/var/lib/dpkg/status*" ], "/home", "/usr/local/*bin", "/var/lib/dpkg/status*" ],
$vsinclude = false, $keep = 30, $sshoptions = false, $options = false, $ssh_dir_manage = true, $vsinclude = false, $keep = 30, $sshoptions = false, $options = false, $ssh_dir_manage = true,
$ssh_dir = false, $authorized_keys_file = false, $installuser = true, $installkey = true, $ssh_dir = false, $authorized_keys_file = false, $installuser = true, $installkey = true,
$backuptag = false, $home = false, $backupkeytype = "rsa") $backuptag = false, $home = false, $backupkeytype = "rsa", $backupkeystore = false)
{ {
include backupninja::client::defaults include backupninja::client::defaults
...@@ -45,7 +45,7 @@ define backupninja::rdiff( ...@@ -45,7 +45,7 @@ define backupninja::rdiff(
"${user}-${name}": user => $user, host => $host, dir => $real_home, "${user}-${name}": user => $user, host => $host, dir => $real_home,
manage_ssh_dir => $ssh_dir_manage, ssh_dir => $ssh_dir, manage_ssh_dir => $ssh_dir_manage, ssh_dir => $ssh_dir,
authorized_keys_file => $authorized_keys_file, installuser => $installuser, authorized_keys_file => $authorized_keys_file, installuser => $installuser,
backuptag => $backuptag, keytype => $backupkeytype, backuptag => $backuptag, keytype => $backupkeytype, backupkeys => $backupkeystore,
} }
backupninja::client::key backupninja::client::key
...@@ -53,6 +53,7 @@ define backupninja::rdiff( ...@@ -53,6 +53,7 @@ define backupninja::rdiff(
"${user}-${name}": user => $user, host => $host, "${user}-${name}": user => $user, host => $host,
installkey => $installkey, installkey => $installkey,
keytype => $backupkeytype, keytype => $backupkeytype,
keystore => $backupkeystore,
} }
} }
} }
......
Supports Markdown
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