Commit graph

129 commits

Author SHA1 Message Date
zertrin
60234a22c3 Merge pull request #60 from johnpatcher/fix/if-condition-quotation
duplicity-backup.sh: Fix quotation issue
2014-02-05 17:50:19 +01:00
Karol Babioch
3bfd78c19c duplicity-backup.sh: Fix quotation issue
The if condition was not quoted correctly, leading to an error that a unary
operator is expected. This fixes it by quoting the condition correctly, which
is already done in the same way for most of the following if conditions.
2014-02-05 16:59:34 +01:00
zertrin
5e939fd632 Merge remote-tracking branch 'dismantl/option-updates' into dev
Conflicts:
	duplicity-backup.sh
2014-02-04 23:44:23 +01:00
Dan Staples
22099553ab dont include --sign-key when restoring w/ hidden-enc key 2014-01-06 17:24:51 -05:00
Dan Staples
417d5262c7 only cleanup if CLEAN_UP_TYPE and CLEAN_UP_VARIABLE are defined 2014-01-03 16:25:26 -05:00
Dan Staples
1864e3ae98 added HIDE_KEY_ID and SECRET_KEYRING options 2014-01-03 15:26:26 -05:00
Yaron de Leeuw
07c1fd2867 Added the option to skip cleanup
I've added the option to skip cleanup by setting CLEANUP_TYPE to  'none'.
This is relevant to me because my s3 api key is not allowed to delete files,
making my backup more resistable to human error / someone getting hold of this
plaintext accessible key.
2014-01-02 16:16:23 +02:00
jaltek
1bd7c260ad Fixes issue zertrin/duplicity-backup/issues/41 - conf revert 2013-11-22 10:32:19 +01:00
jaltek
7d836294ce Fixes issue zertrin/duplicity-backup/issues/41 2013-11-22 10:29:07 +01:00
zertrin
afd29ba2d4 Merge pull request #57 from piperj/pull
Minor typo correction to the README file
2013-11-14 00:57:56 -08:00
Johan Piper
a2204bf1dc Merged https://github.com/zertrin/duplicity-backup.git
Conflicts (straight-forward resolution):
	README.md
2013-11-13 23:22:49 +00:00
Johan Piper
9f8c0c4025 Minor typo correction to the README file 2013-11-13 23:17:44 +00:00
Zertrin
54f9aaf27a Complete the half-done work of previous commit 2013-11-13 21:56:12 +01:00
zertrin
03ef054cf3 Add the --restore-dir synonym and update the documentation accordingly 2013-11-13 21:36:34 +01:00
zertrin
e9af0ab3c1 Some little modifications and additions in the doc of the config file 2013-11-13 20:08:34 +01:00
zertrin
dd05ff68b6 Add support for mail sending via msmtp
(adapted cherry-pick from commit 7f8b9b6e2fb49ce3bae166674a06754e5940ea04 of Dosenpfand)
2013-11-13 19:55:47 +01:00
Federico C. Guizzardi
5c99b4c3ca fixed variable name
(cherry picked from commit 19c80a83a2819bdac73dfe4bc08e270205a9a666)
2013-11-13 19:36:15 +01:00
Johan Piper
bac95a2294 Updated README file to explain --dry-run and --debug 2013-11-12 23:14:28 +00:00
Johan Piper
22e390494c Renamed the --dry-run option to --debug.Created proper duplicity --dry-run command (recommended -v8, info verbosity level) 2013-11-11 00:06:31 +00:00
zertrin
9905761b26 Update README.md to reflect policy change about pull requests 2013-08-12 11:43:45 +02:00
zertrin
c3aa58bf59 Small improvements to the fix of cippino before merge 2013-08-12 11:06:09 +02:00
Federico C. Guizzardi
0275cb5668 Fixed INCLIST 2013-08-02 10:52:08 +02:00
zertrin
02015c89d5 Merge branch 'joubertredrat-ftp-password' 2013-07-22 12:01:48 +02:00
zertrin
dbf78cfcd6 Better explanation of the FTP_PASSWORD variable based on official documentation 2013-07-22 11:59:41 +02:00
zertrin
63d38be243 Add notes about the difference between "mailx" and "mail" commands 2013-07-22 10:20:29 +02:00
zertrin
68931e4f5a Move the new section about remove-all-inc-of-but-n-full a bit lower in the config file. 2013-07-22 10:11:31 +02:00
Ville Walveranta
9b34c04802 Adds the option to use remove-all-inc-of-but-n-full to prune incrementals of backups with long history. 2013-07-21 19:58:46 -05:00
zertrin
3faf4e5ce3 Merge pull request #51 from linsomniac/master
Fixing a typo.
2013-07-19 17:05:31 -07:00
Sean Reifschneider
3ce941c9b4 Typo. 2013-07-19 13:14:11 -06:00
Joubert
582416f2e6 A small contribution with a set a ftp variable to run on a script 2013-07-09 11:52:03 -03:00
zertrin
7bab9666f8 Merge pull request #49 from pew/master
sendmail elif typo
2013-07-07 14:49:32 -07:00
Jonas
7275aaff4c sendmail error 2013-07-07 19:03:42 +02:00
zertrin
82ff39370c Merge pull request #47 from jverdeyen/feature/sendmail
added sendmail as mail command
2013-07-03 01:18:22 -07:00
Joeri Verdeyen
31da9c897c Sendmail as mail command 2013-07-03 09:21:20 +02:00
zertrin
3ad3acad46 Update README.md: gpg is actually optionnal 2013-05-29 00:48:23 +02:00
zertrin
b4f069c87c Update README.md
Minor modifications
2013-05-15 17:59:56 +02:00
zertrin
67b62a8457 Merge pull request #43 from Neal/master
Make readme pretty!
2013-05-15 08:33:18 -07:00
zertrin
1f8fa592b4 Merge pull request #42 from Neal/patch-1
Fix typos.
2013-05-15 07:47:58 -07:00
Neal
c8bf552670 Make readme pretty! (using markdown) 2013-05-14 22:57:45 -05:00
Neal
e636dd40d4 Fix typos. 2013-05-14 22:12:27 -05:00
zertrin
2cd21d6e0b Add cron usage example in README
Following suggestion of benArrayx in issue #35
2013-05-03 15:04:02 +03:00
zertrin
2f3af1ab4d Merge pull request #40 from brki/allow-s3-scheme-when-getting-remote-size
Let s3cmd have the correct bucket name when using s3 scheme
2013-03-31 13:09:01 -07:00
zertrin
6fc32c235c Merge pull request #39 from brki/helpful-config-error-messages
Be a bit more specific about configuration problems
2013-03-31 13:06:37 -07:00
Brian King
89a78edb9f Be a bit more specific about configuration problems 2013-03-31 01:24:26 +01:00
Brian King
7bb45ff939 Let s3cmd have the correct bucket name when using s3 scheme 2013-03-31 01:21:43 +01:00
zertrin
ee1b759656 Fix issue #38 : Multiple recipients
Quick fix for the case of multiple email recipients.
Thanks to raydoll for the bug report.
2013-03-23 00:14:23 +01:00
zertrin
b1554306fb Merge pull request #36 from stijnopheide/osx
Fix for du --exclude-from and mail on OS X
2013-01-29 07:34:22 -08:00
Stijn Opheide
bc0fa15415 Fix for du --exclude-from and mail on OS X 2013-01-29 14:32:05 +01:00
zertrin
feb34dd46a Merge pull request #34 from franek/master
Add nail support
2013-01-14 12:31:33 -08:00
François D.
02fae5cba2 Update duplicity-backup.sh
Add nail support (for busybox / Synology)
2013-01-14 21:25:36 +01:00