2Shirt/duplicity-backup.sh
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Attempt to fix issue #145 by adding a parameter

Browse source
This commit is contained in:
zertrin 2016-10-23 19:39:32 +02:00
parent d2ae7c58c1
commit fb54103607
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
duplicity-backup.conf.example
View file

@ -292,6 +292,14 @@ GPG_SIGN_KEY="foobar_gpg_key"
# #
#SECRET_KEYRING="/home/foobar_user_name/.gnupg/duplicity.gpg #SECRET_KEYRING="/home/foobar_user_name/.gnupg/duplicity.gpg
# Here you can specify options that will be passed to GPG.
# If you can, avoid using quotes here, as it hasn't been tested much yet.
# You shouldn't need to remove the following default (--no-show-photos)
# For example an user reported (GitHub issue #145) that since gnupg v2.1,
# the option "--pinentry-mode loopback" is necessary,
# then set GPG_OPTIONS="--no-show-photos --pinentry-mode loopback"
GPG_OPTIONS="--no-show-photos"
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# STATIC BACKUP OPTIONS # STATIC BACKUP OPTIONS

2
duplicity-backup.sh
View file

@ -335,7 +335,7 @@ fi
LOCKFILE=${LOGDIR}backup.lock LOCKFILE=${LOGDIR}backup.lock
if [ "${ENCRYPTION}" = "yes" ]; then if [ "${ENCRYPTION}" = "yes" ]; then
ENCRYPT="--gpg-options \"--no-show-photos\"" ENCRYPT="--gpg-options \"${GPG_OPTIONS}\""
if [ ! -z "${GPG_ENC_KEY}" ] && [ ! -z "${GPG_SIGN_KEY}" ]; then if [ ! -z "${GPG_ENC_KEY}" ] && [ ! -z "${GPG_SIGN_KEY}" ]; then
if [ "${HIDE_KEY_ID}" = "yes" ]; then if [ "${HIDE_KEY_ID}" = "yes" ]; then
ENCRYPT="${ENCRYPT} --hidden-encrypt-key=${GPG_ENC_KEY}" ENCRYPT="${ENCRYPT} --hidden-encrypt-key=${GPG_ENC_KEY}"