1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-24 16:55:36 +00:00
Commit graph

4838 commits

Author SHA1 Message Date
TW
e838b48b60
Merge pull request #3421 from ThomasWaldmann/add-config-docs-master
add auto-generated docs for borg config
2017-12-09 22:23:57 +01:00
Thomas Waldmann
ce92960c63 add auto-generated docs for borg config
also: move a bit upwards in the use docs
(cherry picked from commit 278ed640e9)
2017-12-09 13:43:36 +01:00
TW
3f4dfc9874
Merge pull request #3405 from milkey-mouse/no-borgfs-html-docs
Don't generate HTML docs page for borgfs
2017-12-03 03:02:29 +01:00
Milkey Mouse
897c003588
Don't generate HTML docs page for borgfs (fixes #3404) 2017-12-02 12:52:37 -08:00
TW
c4e56169e5
Merge pull request #3397 from ThomasWaldmann/port-1.1.3-last-minute-changes
Port 1.1.3 last minute changes
2017-12-02 21:19:12 +01:00
Thomas Waldmann
5cf48eeb16 borg mount: fix hardlink processing, fixes #3388
when the result list after stripping was empty,
os.path.join(*emptylist) fails as it want 1+ args.

(cherry picked from commit dc8de36109)
2017-12-02 18:13:11 +01:00
Thomas Waldmann
4fcb413802 crc32-slice-by-8.c: fix for C90 compilers
crc32_slice_by_8.c:344:3: error: ISO C90 forbids mixed declarations
and code [-Werror=declaration-after-statement]

(cherry picked from commit 23a1d62b25)
2017-12-02 18:13:11 +01:00
Thomas Waldmann
209bf2dc24 move 3rd party docs/license file from package dir to docs/3rd_party
setup.py excludes all .c .h .pyx files from installation, but such
docs / license files would still be copied to the target directory
if they are inside the python "borg" package dir.

(cherry picked from commit 831a06a07d)
2017-12-02 18:13:11 +01:00
Thomas Waldmann
75854c1243 security: fix enforcement of --restrict-to-path in args processing
Fixes CVE-2017-15914 (affects releases 1.1.0, 1.1.1, 1.1.2,
but not 1.0.x).

Thanks to Florian Apolloner for discovering/reporting this!

Also: added tests for this.
(cherry picked from commit ea0203bb0d)
2017-12-02 18:13:11 +01:00
TW
1cf6e1e103
Merge pull request #3407 from ThomasWaldmann/exclude-broken-pytest330
exclude broken pytest 3.3.0 release
2017-12-02 18:02:40 +01:00
Thomas Waldmann
43184f2dd1 exclude broken pytest 3.3.0 release
https://github.com/pytest-dev/pytest/issues/2957
2017-12-02 17:43:38 +01:00
TW
1bf8d43e37
Merge pull request #3387 from ThomasWaldmann/docs-fix-broken-links
docs: fix broken links
2017-11-27 00:01:30 +01:00
Thomas Waldmann
63bdae8314 docs: fix broken links
(cherry picked from commit c7994b598b)
2017-11-27 00:00:46 +01:00
TW
510d44450a
Merge pull request #3384 from ThomasWaldmann/link-to-hp-support
link to the homepage for support/service
2017-11-26 23:38:29 +01:00
Thomas Waldmann
c2521a7759 link to the homepage for support/service
otherwise people ONLY reading the docs (and not coming from the
homepage) will miss these options.

(cherry picked from commit 7438cb2ef4)
2017-11-26 23:37:04 +01:00
Michael Rupert
6dd54f93ce fixed support links (#3379)
fixed support links
2017-11-26 05:10:22 +01:00
TW
c312a9a95b
Merge pull request #3377 from milkey-mouse/fix-build-man
Fix build_man issues
2017-11-26 04:09:03 +01:00
Milkey Mouse
2a83098fac
Fix build_man issues (fixes #3364) 2017-11-25 19:03:00 -08:00
TW
c848141f06
Merge pull request #3375 from ThomasWaldmann/docs-fixes
misc. docs fixes / updates
2017-11-26 03:58:01 +01:00
TW
6b5b4e476b
Merge pull request #3376 from milkey-mouse/borg-config-cmd
Reword borg config help
2017-11-26 02:07:33 +01:00
Milkey Mouse
559ec0062e
Use name of command for "virtual man page" name
This makes it slightly easier to debug manpage issues without removing
the virtmanpage hack.
2017-11-25 17:06:02 -08:00
Milkey Mouse
f44335f91d
Reword basic borg config help
It doesn't edit the repo config, but any borg-related config.
2017-11-25 16:02:38 -08:00
Thomas Waldmann
0eaec60384 docs: give examples for borg mount exclusion options 2017-11-25 20:18:59 +01:00
Thomas Waldmann
91ff2f81a6 docs: move bsdflags tuning comments to notes docs section
the atime comments are already there.
2017-11-25 20:08:33 +01:00
Thomas Waldmann
a107233f75 docs: document birthtime support on platforms supporting it
stat.st_birthtime, MacOS and (some?) BSDs.
2017-11-25 19:51:33 +01:00
Thomas Waldmann
e3cb7c3c32 docs: document good and problematic option placements, see #3356 2017-11-25 19:46:48 +01:00
Thomas Waldmann
f2a1539f25 docs: fix examples with problematic option placements, fixes #3356
have options to the left OR to the right of all positional arguments,
but not on BOTH sides and not in between them.
2017-11-25 19:29:34 +01:00
TW
f45acbb908
Merge pull request #3366 from ThomasWaldmann/create-tuning-options
docs: point out tuning options for borg create, fixes #3239
2017-11-25 15:27:27 +01:00
Thomas Waldmann
520a6a2ef1 docs: point out tuning options for borg create, fixes #3239 2017-11-25 15:21:43 +01:00
TW
4835dce913
Merge pull request #3363 from ThomasWaldmann/update-usage-man
update usage / man
2017-11-25 14:53:35 +01:00
Thomas Waldmann
ef8217afc9 build_man (master)
also: git add borgfs.1
2017-11-25 14:38:04 +01:00
Thomas Waldmann
73fac09dda build_usage (master)
also: add new borgfs.rst.inc
2017-11-25 14:35:52 +01:00
TW
b9b5c1d25e
Merge pull request #3355 from ThomasWaldmann/package-data
clean up and simplify packaging
2017-11-25 14:25:13 +01:00
Thomas Waldmann
feb428b4e0 clean up and simplify packaging
1.1.2 was released with a sdist that included quite some files that
did not belong into the package (I tried nuitka at some time).

This was because the old MANIFEST.in / setup.py included all the stuff
in the package dir.

Now, setuptools_scm is to automatically deal with the INCLUDES and
MANIFEST.in only handles the EXCLUDES, so only committed files get
into the sdist (minus some we do not want).

Also, no .c .h .pyx files will be installed - they are not needed as
they have been compiled into binary files.
2017-11-25 13:48:46 +01:00
Michael Rupert
71fbac94fb Moved Support to .org (#3360)
docs: moved support options to www.borgbackup.org
2017-11-25 03:15:18 +01:00
TW
c5dc75ae23
Merge pull request #3312 from milkey-mouse/borg-config-cmd
Add borg config command
2017-11-24 16:56:15 +01:00
Milkey Mouse
1e520203cb
Fix borg config flake8 failures
Suppressed E731 so lambdas can be assigned to vars
2017-11-23 14:54:53 -08:00
Milkey Mouse
5b47cf6fa5
Add borg config command (fixes #3304)
This command works similarly to "git config" - it parses repo and
cache configs to get, set, and delete values. It only works on local
repos so a malicious client can't e.g. override their storage quota
or reset the append_only flag.

Add tests for borg config

Add documentation for borg config

Change manual config edits -> borg config

There were a couple places in the documentation where it was advised
to edit the repository or cache config file, a process that is stream-
lined by borg config.
2017-11-23 14:51:54 -08:00
TW
afc84cafd4
Merge pull request #3300 from ThomasWaldmann/mount-options
borg mount: support exclusion group options and paths, fixes #2138
2017-11-23 22:43:39 +01:00
TW
483d3e8a8b
Merge pull request #3292 from milkey-mouse/document-ntfsclone
Add instructions for using ntfsclone
2017-11-23 22:07:15 +01:00
Milkey Mouse
c0edc60ca6
Move image backup-related FAQ entries to a new page 2017-11-23 12:14:35 -08:00
Milkey Mouse
d1e327914b Clarify key aliases for borg list --format (#3346)
clarify key aliases for borg list --format, fixes #3111
2017-11-22 17:25:49 +01:00
Thomas Waldmann
caece370b8 borg mount: support --consider-part-files correctly, fixes #3347 2017-11-22 15:08:08 +01:00
Thomas Waldmann
e97deafb16 borg mount: support hardlinks correctly, add tests
previous commit did not yet support hardlinks correctly, if the
hardlink master was excluded somehow.

added some tests for this, also refactored related tests slightly.
2017-11-21 15:39:47 +01:00
Thomas Waldmann
77df1cfe8c borg mount: support exclusion group options and paths, fixes #2138
borg mount [options] repo_or_archive mountpoint path [paths...]

paths: you can just give some "root paths" (like for borg extract) to
only partially populate the FUSE filesystem.

Similar for these exclusion group options:
--exclude
--exclude-from
--pattern
--patterns-from
--strip-components
2017-11-21 15:38:09 +01:00
Milkey Mouse
759c8f77cf Mention break-lock in checkpointing FAQ entry (#3340)
Mention break-lock in checkpointing FAQ entry, fixes #3328
2017-11-20 23:18:37 +01:00
TW
8e82afe344
Merge pull request #3336 from aidantwoods/fix/repo-replay-message
Highlight that information is obtained from security dir
2017-11-20 14:31:45 +01:00
Aidan Woods
21a553b1ae
Highlight that information is obtained from security dir
(deleting the cache will not bypass this error in the
event the user knows this is a legitimate repo).
2017-11-20 01:08:33 +00:00
TW
22ae15f5b4
Merge pull request #3327 from anarcat/faq-remove
add FAQ about removing old files and policies
2017-11-18 21:01:31 +01:00
Milkey Mouse
7cb36a20b4 Document sshfs rename workaround (fixes #3315) (#3325)
Document sshfs rename workaround, fixes #3315
2017-11-18 20:57:39 +01:00