aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSébastien Dailly <sebastien@chimrod.com>2020-09-05 14:43:42 +0200
committerSébastien Dailly <sebastien@chimrod.com>2020-09-05 14:43:42 +0200
commite2bed5b540cab47414488debdfb10ebd8421a21b (patch)
tree01aeeb10a9e6e3333b91003fd6d539538b11f6de
parentb9852c7d93fdd9aa2eea4787688afb5cebc71fcf (diff)
Update duply conf
-rw-r--r--duply/.duply/jdr/conf3
-rw-r--r--duply/.duply/music/conf4
-rw-r--r--duply/scripts/duplicity/duply_common.sh2
3 files changed, 4 insertions, 5 deletions
diff --git a/duply/.duply/jdr/conf b/duply/.duply/jdr/conf
index 19ed70d..8874863 100644
--- a/duply/.duply/jdr/conf
+++ b/duply/.duply/jdr/conf
@@ -7,7 +7,7 @@ export PCA_OS_REGION_NAME=GRA
export HOT_OS_REGION_NAME=GRA
GPG_KEYS_ENC='2421BCBD56473645,933FFFBA5E8867338DF2FF645E23E7695299F9AB'
-GPG_KEY_SIGN='F6859BC3CC712DF8'
+USER_GPG_KEY_SIGN='F6859BC3CC712DF8'
# set if signing key passphrase differs from encryption (key) passphrase
# NOTE: available since duplicity 0.6.14, translates to SIGN_PASSPHRASE
#GPG_PW_SIGN='<signpass>'
@@ -27,4 +27,3 @@ GPG_KEY_SIGN='F6859BC3CC712DF8'
. ~/scripts/duplicity/duply_common.sh
-DUPL_PARAMS="$DUPL_PARAMS --file-prefix-manifest 'hot_' --file-prefix-signature 'hot_' --file-prefix-archive 'cold_' "
diff --git a/duply/.duply/music/conf b/duply/.duply/music/conf
index 63e110a..f3ca563 100644
--- a/duply/.duply/music/conf
+++ b/duply/.duply/music/conf
@@ -7,7 +7,7 @@ export PCA_OS_REGION_NAME=GRA
export HOT_OS_REGION_NAME=GRA
GPG_KEYS_ENC='2421BCBD56473645,933FFFBA5E8867338DF2FF645E23E7695299F9AB'
-GPG_KEY_SIGN='F6859BC3CC712DF8'
+USER_GPG_KEY_SIGN='F6859BC3CC712DF8'
# set if signing key passphrase differs from encryption (key) passphrase
# NOTE: available since duplicity 0.6.14, translates to SIGN_PASSPHRASE
#GPG_PW_SIGN='<signpass>'
@@ -26,5 +26,3 @@ GPG_KEY_SIGN='F6859BC3CC712DF8'
#GPG_OPTS=''
. ~/scripts/duplicity/duply_common.sh
-
-DUPL_PARAMS="$DUPL_PARAMS --file-prefix-manifest 'hot_' --file-prefix-signature 'hot_' --file-prefix-archive 'cold_' "
diff --git a/duply/scripts/duplicity/duply_common.sh b/duply/scripts/duplicity/duply_common.sh
index 0a55b64..c2c330c 100644
--- a/duply/scripts/duplicity/duply_common.sh
+++ b/duply/scripts/duplicity/duply_common.sh
@@ -23,3 +23,5 @@ read() {
~/scripts/duplicity/gen_config_remote.sh "${JSON_CONF}"
TARGET="multi:${JSON_CONF}?mode=mirror&onfail=continue"
+
+DUPL_PARAMS="$DUPL_PARAMS --file-prefix-manifest 'hot_' --file-prefix-signature 'hot_' --file-prefix-archive 'cold_' --sign-key ${USER_GPG_KEY_SIGN} "