86ed0651c5ce4a4de599d2851865baea06ef441a

Author
Zertrin <zertrin@gmail.com>
Committer
Zertrin <zertrin@gmail.com>
Date

Message

Adaptation of the script's self-backup process resulting from puredoze's enhancement

Diff

This diff is truncated to protect this page.

 1diff --git a/CHANGELOG b/CHANGELOG
 2index 15739d2736a7edf7ec4edc938b1e1a63dec17dd0..efec0e3c3d3240cfbad0855ed5e19f77ed8ed616 100644
 3--- a/CHANGELOG
 4+++ b/CHANGELOG
 5@@ -1,3 +1,8 @@
 6+0.8.1 (15 August 2012)
 7+======================
 8+  * Added support for using separate signature and encryption keys [puredoze]
 9+  * Adaptation of the script's self-backup process resulting from puredoze's enhancement
10+
11 0.8 (05 August 2012)
12 ===================
13   * Improved argument parsing. Now the script is insensitive to the order of appearance of the options and handles correctly optional options parameters
14diff --git a/duplicity-backup.conf.example b/duplicity-backup.conf.example
15index 448a73e1471480399c119bba54fb3f3b4ca61c37..89861be10f4003b59558040017506dbe321e0db6 100644
16--- a/duplicity-backup.conf.example
17+++ b/duplicity-backup.conf.example
18@@ -63,6 +63,8 @@ PASSPHRASE="foobar_gpg_passphrase"
19 # (see http://www.debian-administration.org/articles/209#d0e109).
20 # If you are not running the script from a cron, duplicity should prompt you for the 
21 # GPG_SIGN_KEY password.
22+# If you choose to use the same GPG key for encryption and signature, set it both
23+# in GPG_ENC_KEY and GPG_SIGN_KEY.
24 # Comment out if you're using only PASSPHRASE (symmetric encryption) or not using 
25 # encryption at all.
26 GPG_ENC_KEY="foobar_gpg_key"
27diff --git a/duplicity-backup.sh b/duplicity-backup.sh
28index 35639c3681f608669a095460eff114c25439cfb4..403d7e681c481f8ccd15a41909b2fbd63ff04a1e 100755
29--- a/duplicity-backup.sh
30+++ b/duplicity-backup.sh
31@@ -172,7 +172,7 @@ size information unavailable."
32 NO_S3CMD_CFG="WARNING: s3cmd is not configured, run 's3cmd --configure' \
33 in order to retrieve remote file size information. Remote file \
34 size information unavailable."