mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-02-24 15:12:00 +00:00
Code Issues Releases Wiki Activity
3518 commits 9 branches 139 tags 63 MiB
Commit graph

178 commits

Author SHA1 Message Date
Marian Beermann
ecad0ed53a Merge branch '1.0-maint' into merge/1.0-maint 
# Conflicts: ... everywhere ...
#	.travis.yml
#	Vagrantfile
#	borg/testsuite/key.py
#	docs/changes.rst
#	docs/quickstart.rst
#	docs/usage.rst
#	docs/usage/upgrade.rst.inc
#	src/borg/archive.py
#	src/borg/archiver.py
#	src/borg/crypto.pyx
#	src/borg/helpers.py
#	src/borg/key.py
#	src/borg/remote.py
#	src/borg/repository.py
#	src/borg/testsuite/archive.py
#	src/borg/testsuite/archiver.py
#	src/borg/testsuite/crypto.py
#	src/borg/testsuite/helpers.py
#	src/borg/testsuite/repository.py
#	src/borg/upgrader.py
#	tox.ini
 2017-01-12 15:01:41 +01:00
Thomas Waldmann
01090d2d40 fix typos 
taken from debian package, thanks to danny edel and lintian for finding these.
 2017-01-12 02:25:41 +01:00
Marian Beermann
28ad779a6f Add tertiary authentication for metadata (TAM) 
Signed-off-by: Thomas Waldmann <tw@waldmann-edv.de>
 2016-12-17 20:06:41 +01:00
Marian Beermann
c3a2dc5f55 Rename BORG_NONCES_DIR to BORG_SECURITY_DIR 2016-11-29 17:43:06 +01:00
Thomas Waldmann
c83a124e65 Merge branch '1.0-maint' (into master) 2016-11-28 02:23:32 +01:00
Marian Beermann
bf3a1f0c33 docs/usage: fix literal/emph without end-string (two instances) 2016-11-27 20:18:27 +01:00
Thomas Waldmann
30d1e21e53 fixup: fixes, clarify 2016-11-26 20:49:39 +01:00
Thomas Waldmann
76c5f1a258 add more details about resource usage 2016-11-26 04:34:01 +01:00
Thomas Waldmann
0a0b913739 implement BORG_NEW_PASSPHRASE, fixes #1768 2016-11-24 23:43:27 +01:00
Thomas Waldmann
5fe5b6b339 docs: different pattern matching for --exclude, fixes #1779 2016-11-19 22:26:07 +01:00
Thomas Waldmann
d8e806aac1 docs: datetime formatting examples for {now} placeholder, fixes #1822 2016-11-19 22:04:13 +01:00
Thomas Waldmann
3d174aef35 docs: clarify passphrase mode attic repo upgrade, fixes #1854 2016-11-19 21:52:11 +01:00
Thomas Waldmann
d7284a92f0 docs: clarify --umask usage, fixes #1859 2016-11-19 21:38:13 +01:00
Thomas Waldmann
afab1cc9b0 Merge branch '1.0-maint' 
# Conflicts:
#	borg/platform.py
#	src/borg/archiver.py
#	src/borg/helpers.py
#	src/borg/platform/darwin.pyx
#	src/borg/platform/freebsd.pyx
#	src/borg/platform/linux.pyx
#	src/borg/testsuite/__init__.py
 2016-11-17 23:56:34 +01:00
Thomas Waldmann
e17fe2b295 borg umount, fixes #1855 
this refactors umount code we already used for the testsuite into the platform module's namespace.

also, it exposes that functionality via the cli api, so users can use it via "borg umount <mountpoint>",
which is more consistent than using borg to mount and fusermount -u (or umount) to un-mount.
 2016-11-17 20:16:28 +01:00
Marian Beermann
a31ca4f022
crypto: link against system libb2, if possible 2016-11-11 03:08:11 +01:00
Thomas Waldmann
8a15916284 Merge branch '1.0-maint' into merge-1.0-maint 
# Conflicts:
#	docs/changes.rst
#	docs/usage/help.rst.inc
#	src/borg/cache.py
#	src/borg/remote.py
#	src/borg/testsuite/__init__.py
#	src/borg/testsuite/archiver.py
 2016-10-31 18:24:13 +01:00
Thomas Waldmann
a16c7d8e16 mention file:// 2016-10-28 05:04:23 +02:00
Thomas Waldmann
ca15cc80e5 document repo URLs / archive location 2016-10-28 04:43:33 +02:00
Thomas Waldmann
09e74af7bf Merge branch '1.0-maint' 2016-10-24 21:41:20 +02:00
Thomas Waldmann
d363907b5a document BORG_NONCES_DIR, fixes #1592 2016-10-21 04:15:33 +02:00
Thomas Waldmann
c000eb8083 add clarification about append-only mode, fixes #1689 2016-10-19 02:31:39 +02:00
Thomas Waldmann
b88e82d99d remove debug-xxx commands, fixes #1627 
we use "debug xxx" subcommands now. docs updated.

also makes "borg help" shorter as not all debug-xxx commands
show up, but just 1 main "debug" command.
 2016-10-10 00:22:01 +02:00
Thomas Waldmann
4c01857461 Merge branch '1.0-maint' into merge-1.0-maint 2016-09-30 23:42:48 +02:00
Thomas Waldmann
a65707beb8 add more specific warning about write-access debug commands 2016-09-30 21:09:02 +02:00
Thomas Waldmann
2a864be84f Merge branch '1.0-maint' into merge-1.0-maint 
# Conflicts:
#	setup.py
#	src/borg/archiver.py
#	src/borg/helpers.py
 2016-09-27 21:31:41 +02:00
textshell
b84014e7d9 archiver: Add documentation for "key export" and "key import" commands. (#1641) 
archiver: Add documentation for "key export" and "key import" commands
 2016-09-27 15:24:31 +02:00
Thomas Waldmann
1287d1ae92 Merge branch '1.0-maint' into merge-1.0-maint 
# Conflicts:
#	docs/development.rst
#	src/borg/archive.py
#	src/borg/archiver.py
#	src/borg/hashindex.pyx
#	src/borg/testsuite/hashindex.py
 2016-09-14 02:53:41 +02:00
Thomas Waldmann
f70008238a link reference docs and faq about BORG_FILES_CACHE_TTL, fixes #1561 2016-09-03 19:23:59 +02:00
Thomas Waldmann
1f04820d9d fuse: implement versions view 
all archives, all items are read to build a unified view.
files are represented by a same-name directory with the versions of the file.
A filename suffix computed by adler32(chunkids) is used to disambiguate the versions.

also: refactor code a little, create methods for leaves, inner nodes.
 2016-08-27 23:17:57 +02:00
Andrew Engelbrecht
f8bb73732c added doc for "pull" type backup over sshfs 
Fixes #900
 2016-08-21 01:04:16 -04:00
Thomas Waldmann
8be6761c26 Merge commit 'feb7e2517ef7ec07cc638953a86c726aada7d37e' 2016-08-14 15:05:11 +02:00
Thomas Waldmann
6e658a5a6c docs: improve prune examples 2016-08-10 15:45:57 +02:00
Thomas Waldmann
dbe862f3d8 Merge branch '1.0-maint' into merge-1.0-maint 2016-08-06 01:24:22 +02:00
Thomas Waldmann
5f7b466969 implement BORG_FILES_CACHE_TTL, update FAQ 
raise default ttl to 20 (previously: 10).
 2016-07-31 01:33:46 +02:00
Thomas Waldmann
9865509105 docs: remove borg list example, be more specific about compression heuristics 2016-07-30 21:21:45 +02:00
Marian Beermann
2e6eb63174
Merge branch '1.0-maint' into master 2016-07-14 01:28:26 +02:00
Thomas Waldmann
cf4d761042 docs: fix the highlighting 
default is "python", that's why some help fragments and bash scripts looked strange.
 2016-07-11 23:16:53 +02:00
Thomas Waldmann
fe627246e4 Merge branch '1.0-maint' 2016-07-08 12:13:52 +02:00
Thomas Waldmann
1fe3781186 backport some FAQ entries from master branch 2016-07-07 21:56:06 +02:00
Thomas Waldmann
12f55f4e9f Merge branch '1.0-maint' 2016-07-06 01:33:53 +02:00
Thomas Waldmann
f363ddd7ca Merge branch '1.0-maint' 2016-07-04 20:11:21 +02:00
Thomas Waldmann
3325126988 add missing BORG_REMOTE_PATH env var, fixes #1258 2016-07-04 15:06:20 +02:00
Thomas Waldmann
d59a1d5fef doc and help update for --read-special 2016-07-04 14:06:30 +02:00
Lee Bousfield
c515d6018d
Add --append-only to borg serve 
Fixes #1168
 2016-06-30 17:58:36 -04:00
Thomas Waldmann
87d6755108 Merge branch '1.0-maint' 2016-06-29 18:28:33 +02:00
Thomas Waldmann
c773c882b9 add prune visualization / example, fixes #723 2016-06-27 21:20:35 +02:00
Thomas Waldmann
ed128e517b Merge branch '1.0-maint' 2016-06-25 17:18:14 +02:00
Thomas Waldmann
5ae340998c update docs about placeholders 2016-06-22 08:40:31 +02:00
Ed Blackman
226e5519f3 Print implied output without --info/-v 
There are persistent questions why output from options like --list
and --stats doesn't show up.  Also, borg currently isn't able to
show *just* the output for a given option (--list, --stats,
--show-rc, --show-version, or --progress), without other INFO level
messages.

The solution is to use more granular loggers, so that messages
specific to a given option goes to a logger designated for that
option.  That option-specific logger can then be configured
separately from the regular loggers.

Those option-specific loggers can also be used as a hook in a
BORG_LOGGING_CONF config file to log the --list output to a separate
file, or send --stats output to a network socket where some daemon
could analyze it.

Steps:
- create an option-specific logger for each of the implied output options
- modify the messages specific to each option to go to the correct logger
- if an implied output option is passed, change the option-specific
  logger (only) to log at INFO level
- test that root logger messages don't come through option-specific loggers

They shouldn't, per https://docs.python.org/3/howto/logging.html#logging-flow
but test just the same.  Particularly test a message that can come from
remote repositories.

Fixes #526, #573, #665, #824
 2016-05-18 14:58:44 -04:00