From fb541036074b7e26290ed2498396d7045e415b14 Mon Sep 17 00:00:00 2001 From: zertrin Date: Sun, 23 Oct 2016 19:39:32 +0200 Subject: [PATCH] Attempt to fix issue #145 by adding a parameter --- duplicity-backup.conf.example | 8 ++++++++ duplicity-backup.sh | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/duplicity-backup.conf.example b/duplicity-backup.conf.example index ccb407e..b73fbdb 100644 --- a/duplicity-backup.conf.example +++ b/duplicity-backup.conf.example @@ -292,6 +292,14 @@ GPG_SIGN_KEY="foobar_gpg_key" # #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 diff --git a/duplicity-backup.sh b/duplicity-backup.sh index d6c780d..28aeffc 100755 --- a/duplicity-backup.sh +++ b/duplicity-backup.sh @@ -335,7 +335,7 @@ fi LOCKFILE=${LOGDIR}backup.lock 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 [ "${HIDE_KEY_ID}" = "yes" ]; then ENCRYPT="${ENCRYPT} --hidden-encrypt-key=${GPG_ENC_KEY}"