mirror of
https://0xacab.org/liberate/backupninja.git
synced 2024-09-19 23:21:40 +02:00
dup: now possible to use different keys to sign and encrypt
This commit is contained in:
parent
0a60cd6e3b
commit
e8c8a32ac2
@ -20,6 +20,8 @@ version 0.9.2 -- unreleased
|
||||
a nice menu to choose the Vservers to backup (thanks to
|
||||
lib/vserver)
|
||||
added man/ninjahelper.1 man page
|
||||
duplicity handler: now possible to use different keys to encrypt and
|
||||
sign
|
||||
|
||||
version 0.9.1 -- November 05 2005
|
||||
rearranged source so that it is relocatable with autotools
|
||||
|
@ -19,13 +19,17 @@ nicelevel = 19
|
||||
password = a_very_complicated_passphrase
|
||||
|
||||
# default is no, for backward compatibility with backupninja <= 0.5.
|
||||
# when set to yes, encryptkey option must be set below.
|
||||
# when set to yes, either signkey or encryptkey option must be set below.
|
||||
sign = yes
|
||||
|
||||
# key ID used for data encryption and, optionnally, signing.
|
||||
# if not set, local root's default gpg key is used.
|
||||
# key ID used for data encryption.
|
||||
# if not set, local root's default GnuPG key is used.
|
||||
encryptkey = 04D9EA79
|
||||
|
||||
# key ID used for data signing.
|
||||
# if not set, encryptkey will be used.
|
||||
#signkey = 04D9EA79
|
||||
|
||||
######################################################
|
||||
## source section
|
||||
## (where the files to be backed up are coming from)
|
||||
|
17
handlers/dup
17
handlers/dup
@ -11,6 +11,7 @@ setsection gpg
|
||||
getconf password
|
||||
getconf sign no
|
||||
getconf encryptkey
|
||||
getconf signkey
|
||||
|
||||
setsection source
|
||||
getconf include
|
||||
@ -79,11 +80,17 @@ scpoptions="$sshoptions"
|
||||
|
||||
execstr="$options --no-print-statistics --scp-command 'scp $scpoptions' --ssh-command 'ssh $sshoptions' "
|
||||
|
||||
if [ "$encryptkey" == "" ]; then
|
||||
[ "$sign" != "yes" ] || fatal "encryptkey option must be set when signing."
|
||||
else
|
||||
execstr="${execstr}--encrypt-key $encryptkey "
|
||||
[ "$sign" != "yes" ] || execstr="${execstr}--sign-key $encryptkey "
|
||||
# if encryptkey is set, add --encrypt-key to the command-line
|
||||
[ -z "$encryptkey" ] || execstr="${execstr}--encrypt-key $encryptkey "
|
||||
# if signkey is not set, set it to encryptkey
|
||||
[ -n "$signkey" ] || signkey="$encryptkey"
|
||||
# if needed, add --sign-key to command-line
|
||||
if [ "$sign" == "yes" ]; then
|
||||
if [ -n "$signkey" ]; then
|
||||
execstr="${execstr}--sign-key $signkey "
|
||||
else
|
||||
fatal "Either encryptkey or signkey option must be set when signing."
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$keep" != "yes" ]; then
|
||||
|
Loading…
Reference in New Issue
Block a user