Commit graph

298 commits

Author SHA1 Message Date
zertrin
18c7f40a7f Merge pull request #71 from martinec/master
fix: ensure a trailing slash in log dir name
2014-08-16 17:42:41 +02:00
martinec
7b20db3953 fix: ensure a trailing slash in log dir name
LOGDIR="/foo/bar" (without  a trailing slash) produces /foo/barbackup.lock and/foo/barduplicity-* files, not /foo/bar/backup.lock and /foo/bar/duplicity-* files as expected. This fix ensures a trailing slash in the log dir name.
2014-08-10 03:08:38 +02:00
zertrin
4b640db241 Merge pull request #68 from ifdattic/add-note-about-escaping-passphrase
Add a note in configuration about escaping "$" in passphrase
2014-06-06 16:01:53 +02:00
zertrin
e84daf47e4 Merge pull request #67 from ifdattic/add-google-docs-destination
Add Google Docs destination to configuration
2014-06-06 16:01:26 +02:00
zertrin
33a0bd6b3b Merge pull request #66 from ifdattic/fix-typos
Fix typos, remove trailing whitespace
2014-06-06 16:00:58 +02:00
Andrew M
456f5cd835 Add a note in configuration about escaping "$" in passphrase 2014-06-06 12:11:58 +03:00
Andrew M
615a988779 Add Google Docs destination to configuration 2014-06-06 12:09:04 +03:00
Andrew M
a148ac8a5c Fix typos, remove trailing whitespace 2014-06-06 12:03:18 +03:00
zertrin
e0a38f8453 Update README.md, format, precision about backends 2014-04-26 09:21:30 +02:00
zertrin
1bde60d7b7 Add REMOVE_LOGS_OLDER_THAN parameter to the config file 2014-04-16 15:05:23 +02:00
zertrin
54f1389a05 Merge commit '9f5626bd19' from jbernhard/duplicity-backup into dev 2014-04-16 14:56:14 +02:00
zertrin
a197a5cd07 Update README.md - add link to duplicity at the beginning 2014-04-16 14:44:52 +02:00
zertrin
427c8ed083 Update README.md
by making the distinction between duplicity-backup.sh and duplicity
2014-04-16 14:40:24 +02:00
Jonah Bernhard
9f5626bd19 Add option to remove old log files. 2014-03-30 14:44:31 -04:00
Jonah Bernhard
36f87c73f1 Only change log file ownership if necessary. 2014-03-30 14:44:17 -04:00
Jonah Bernhard
b20f7ab687 Clarification when remote size unavailable. 2014-03-30 14:43:53 -04:00
Matthias Rampke
4f90cc7440 add support for DragonFly and OpenBSD
DragonFly is a FreeBSD derivative, so the same `du` flags as for FreeBSD
and Darwin apply. OpenBSD does not support exclusion.

The correct invocation for in-place `sed` without backup varies. GNU Sed
allows just leaving out the suffix, but BSD Sed requires an empty suffix
(which in turn GNU Sed doesn't accept). OpenBSD Sed has no in-place
option, use `ed` instead.

`mail` works the same on all BSD.

explicitly list `bash` dependency, it's not installed on most BSD by default.
2014-03-04 12:22:14 +01:00
zertrin
0f11e6f163 Merge pull request #61 from jaltek/patch-1
Update README.md - Reduced the wishlist
2014-03-03 00:31:24 +01:00
Jan
7d5db1119f Update README.md - Reduced the wishlist
I think the last point was implemented with #41 ;)
2014-02-11 18:08:57 +01:00
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