1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-28 02:38:43 +00:00
Commit graph

774 commits

Author SHA1 Message Date
Thomas Waldmann
4e08bbcf0b document BORG_HOSTNAME_IS_UNIQUE, fixes #2087 2017-02-19 05:12:00 +01:00
enkore
d9fe4a1e2c Merge pull request #2160 from enkore/f/cryptodocs
add "Cryptography in Borg" and "Remote RPC protocol security" sections
2017-02-16 20:27:34 +01:00
Marian Beermann
8e8d9d3f48 docs: add edited "Cryptography in Borg" and "Remote RPC protocol security" sections
The former section is a bit older (Nov 2016) and has been the piece
responsible for finding CVE-2016-10099, since while writing it I
wondered how the manifest was authenticated to actually
*be* the manifest. Well. There it is ;)

It has been edited to final form only recently and should now be ready
for review.

The latter section is new.
2017-02-16 20:27:16 +01:00
Marian Beermann
3d79d441a5 faq: update Which file types, attributes, etc. are *not* preserved?
ext4 immutable has been supported for a while.
2017-02-16 16:49:26 +01:00
Marian Beermann
9e0ea92a9d docs: FAQ by categories as proposed by @anarcat in #1802
Usage & Limitations
Security
Common issues
Miscellaneous (only three items, two fork-related)

Note: This does not change any links to FAQ items.
2017-02-16 16:06:15 +01:00
Marian Beermann
4446577dd5 docs: less spacing between options 2017-02-14 23:11:21 +01:00
enkore
22464295cf Merge pull request #2156 from enkore/f/devmodel
new branching model
2017-02-14 13:02:33 +01:00
Marian Beermann
5e0c2d4b11 new branching model 2017-02-14 13:01:46 +01:00
Marian Beermann
44798e0edd setup.py: build_api: sort file list for determinism
# Conflicts:
#	docs/api.rst
#	setup.py

Original-Commit: e208d115
2017-02-13 21:24:33 +01:00
Marian Beermann
79dd920661 update CHANGES (1.0.10)
# Conflicts:
#	docs/changes.rst

Original-Commit: e635f219
2017-02-13 21:24:33 +01:00
Martin Hostettler
179f1bc147 Add qr html export mode to key export command 2017-02-13 21:24:33 +01:00
Martin Hostettler
e0f36e8613 quickstart.rst: Add link to paperkey template. 2017-02-13 20:45:49 +01:00
Martin Hostettler
b44882d10c paperkey.html: Add interactive html template for printing key backups. 2017-02-13 20:45:46 +01:00
Marian Beermann
0971fdce8d docs: changes: fix two rST warnings 2017-02-12 18:51:41 +01:00
Marian Beermann
847797b477 update development.rst for docs changes 2017-02-12 18:51:41 +01:00
Marian Beermann
95b69a433c docs: usage: remove not-updated-anymore debug* files. 2017-02-12 18:51:41 +01:00
Marian Beermann
96fa1e8414 docs: define "ours" merge strategy for auto-generated files 2017-02-12 18:51:40 +01:00
Marian Beermann
1d9378f12c man pages: generate page for subparsers, eg. borg-key(1)
Conflicts:
	docs/man/borg-key.1
2017-02-12 15:28:59 +01:00
Marian Beermann
fa24e1f38f man pages: add borg(1) master/intro page 2017-02-12 15:28:59 +01:00
Marian Beermann
15dfaae223 docs: create: move --exclude note to main doc 2017-02-12 15:28:59 +01:00
Marian Beermann
0710bbd40e docs: create: move item flags to main doc 2017-02-12 15:28:58 +01:00
Marian Beermann
1d91d2699c commit man pages 2017-02-05 15:46:46 +01:00
Marian Beermann
d6a26ca26d docs: fix examples using borg init without -e/--encryption 2017-02-05 15:46:46 +01:00
Marian Beermann
4e0422cdf0 Move change-passphrase to the "key" group (but leave old name, too) 2017-02-04 15:10:45 +01:00
Marian Beermann
5fe32866e6 Move migrate-to-repokey to the "key" command group 2017-02-04 15:10:45 +01:00
TW
c6ea34be96 Merge pull request #2111 from ThomasWaldmann/merge-1.0-maint
Merge 1.0-maint
2017-02-01 12:13:37 +01:00
Leo Antunes
dd6b90fe6c change dir_is_tagged to use os.path.exists()
Add --keep-exclude-tags option as alias to --keep-tag-files and
deprecate the later. Also make tagging accept directories as tags,
allowing things like `--exclude-if-present .git`.

fixes #1999
2017-01-29 18:13:51 +01:00
Thomas Waldmann
e19537ff6f ran build_usage 2017-01-29 05:54:25 +01:00
Thomas Waldmann
c0dc644ef6 Merge branch '1.0-maint' into merge-1.0-maint
# Conflicts:
#	MANIFEST.in
#	Vagrantfile
#	docs/changes.rst
#	docs/usage/mount.rst.inc
#	src/borg/archiver.py
#	src/borg/fuse.py
#	src/borg/repository.py
2017-01-29 05:49:53 +01:00
Thomas Waldmann
e6c1931d47 ran build_usage 2017-01-28 23:36:56 +01:00
Thomas Waldmann
dc3492642d update CHANGES (1.0-maint) 2017-01-28 23:26:25 +01:00
Marian Beermann
fbaefc98c9 docs: add CVE numbers for issues fixed in 1.0.9
https://www.cvedetails.com/product/35461/Borg-Borg.html?vendor_id=16008
2017-01-27 11:58:08 +01:00
Thomas Waldmann
e32503b84c ran setup.py build_usage 2017-01-15 02:10:55 +01:00
Thomas Waldmann
1845074b2e update CHANGES (master) 2017-01-15 02:10:55 +01:00
Thomas Waldmann
740312f725 Merge branch '1.0-maint' into merge-1.0-maint
# Conflicts:
#	requirements.d/development.txt
#	tox.ini
2017-01-15 01:15:04 +01:00
Thomas Waldmann
9e8af73d7f update CHANGES (1.0-maint) 2017-01-15 01:05:40 +01:00
Thomas Waldmann
70cc201377 Merge branch '1.0-maint' into merge-1.0-maint 2017-01-14 16:53:38 +01:00
Thomas Waldmann
85b3625bca update CHANGES (1.0-maint) 2017-01-14 16:51:08 +01:00
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
6603133344 update CHANGES (1.0-maint) 2017-01-12 03:37:52 +01:00
Marian Beermann
10f48dbd0b Update 1.1.0b3 CHANGES 2017-01-12 02:44:04 +01:00
TW
b206aa771c Merge pull request #2016 from ThomasWaldmann/fix-typos
fix typos
2017-01-12 02:27:13 +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
enkore
53aaee3519 Merge pull request #2000 from enkore/issue/1997
check: fail if single archive does not exist
2017-01-12 02:08:38 +01:00
TW
1c1a289c8a Merge pull request #2008 from ThomasWaldmann/update-1.0-changes
update CHANGES (1.0-maint)
2017-01-12 01:31:26 +01:00
sherbang
33be583920 Update faq.rst 2017-01-07 18:48:48 -05:00
Thomas Waldmann
69b816fe76 update CHANGES (1.0-maint) 2017-01-07 23:12:27 +01:00
Marian Beermann
be8e0c89b3 check: fail if single archive does not exist 2017-01-04 19:25:03 +01:00
Marian Beermann
7519bf8100 fix change-passphrase crashing if repository is not encrypted 2017-01-03 17:15:59 +01:00
Marian Beermann
6a5b3018c1 fix upgrade --tam crashing if repository is not encrypted 2017-01-03 17:15:32 +01:00