1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-25 17:27:31 +00:00
Commit graph

1288 commits

Author SHA1 Message Date
Thomas Portmann
dfc5e915cc
Fixed locking, issue #4923 (#4928)
locking: fix ExclusiveLock race condition bug, fixes #4923

- ExclusiveLock is now based on os.rename instead of os.mkdir.
- catch FileNotFoundError observed under race condition in ExclusiveLock.release()
  and .kill_stale_lock()
- added TestExclusiveLock.test_race_condition() which reveals issue #4923
- updated docs
- locking: use "raise LockTimeout from None" for prettier traceback

Co-authored-by: Thomas Portmann <thomas@portmann.org>
Co-authored-by: Thomas Waldmann <tw@waldmann-edv.de>
2020-07-03 10:09:32 +02:00
TW
7033d5054f
Merge pull request #5226 from ThomasWaldmann/server-enforces-umask
--umask is for the local borg process only, fixes #4947
2020-06-28 14:58:41 +02:00
Benedikt Seidl
6a1f31bf29
[DOCS] Add socat pull mode (#5150)
docs: describe socat pull mode, fixes #900

also: fix sphinx deprecation warning

borg/docs/conf.py:114: RemovedInSphinx40Warning: The app.add_stylesheet() is deprecated. Please use app.add_css_file() instead.
2020-06-23 02:09:35 +02:00
TW
e351eedd87
Merge pull request #5140 from fantasya-pbem/docs/2088_Move-resources
[DOCS] Move content of resources doc page to community project, #2088
2020-06-20 01:04:02 +02:00
TW
8e846935a2
Merge pull request #5201 from strager/import-to-key-file
allow key-import+BORG_KEY_FILE to create key files
2020-06-20 00:32:09 +02:00
Thomas Waldmann
c531901763 --umask is for the local borg process only, fixes #4947
The umask value is NOT transmitted from client to server any more,
so the borg client can not influence the borg server umask any more.

If one wants to have a specific umask on the server side, one needs to
use a ssh forced command in .ssh/authorized_keys file.

OTOH, as the default value is 077 (in general, for client as well as for
the server) and the server does not take the value from the client any more,
there usually should be no need to give it on the server side, IF you are
happy with the default value.
2020-06-14 18:35:03 +02:00
Thomas Waldmann
bfd80ee64a update CHANGES with 1.1.12 and 1.1.13 changelog 2020-06-14 15:08:37 +02:00
Thomas Waldmann
fc669b387a update CHANGES 2020-06-14 14:57:42 +02:00
Matthew Glazar
5a32de918e allow key-import+BORG_KEY_FILE to create key files
Running 'borg key import' on a keyfile repository with the BORG_KEY_FILE
environment variable set works correctly if the BORG_KEY_FILE file
already exists. However, the command crashes if the BORG_KEY_FILE file
does not exist:

    $ BORG_KEY_FILE=newborgkey borg key import /home/strager/borg-backups/straglum borgkey
    Local Exception
    Traceback (most recent call last):
      [snip]
      File "[snip]/borg/crypto/key.py", line 713, in sanity_check
        with open(filename, 'rb') as fd:
    FileNotFoundError: [Errno 2] No such file or directory: '[snip]/newborgkey'

    Platform: Linux straglum 5.0.0-25-generic #26~18.04.1-Ubuntu SMP Thu Aug 1 13:51:02 UTC 2019 x86_64
    Linux: debian buster/sid
    Borg: 1.1.11  Python: CPython 3.7.7 msgpack: 0.5.6
    PID: 15306  CWD: /home/strager/Projects/borg
    sys.argv: ['[snip]/borg', 'key', 'import', '/home/strager/borg-backups/straglum', 'borgkey']
    SSH_ORIGINAL_COMMAND: None

Make 'borg key import' not require the BORG_KEY_FILE file to already
exist.

This commit does not change the behavior of 'borg key import' without
BORG_KEY_FILE. This commit also does not change the behavior of 'borg
key import' on a repokey repository.
2020-06-04 19:29:15 -07:00
Uriel
8b6f4a1afe
docs: explain hash collision (#5188)
explain hash collision probability, fixes #4884
2020-06-02 22:19:54 +02:00
Thomas Waldmann
1581c4f9c4 build_man 2020-04-21 22:59:27 +02:00
Thomas Waldmann
17220e09ab build_usage 2020-04-21 22:56:55 +02:00
Thomas Waldmann
95d10b84c4 update CHANGES, set release date 2020-04-21 22:52:54 +02:00
TW
27a41f5c1f
Merge pull request #5115 from ThomasWaldmann/redo-pr-4269
docs: clarify borg init's encryption modes
2020-04-21 11:45:40 +02:00
Thomas Waldmann
b5ab795d6f update CHANGES (master) 2020-04-20 22:36:41 +02:00
Thalian
bfbb1ca525 [DOCS] Move content of resources doc page to community project, #2088 2020-04-19 19:13:02 +02:00
Thalian
5cb8bd0dd0 [DOC] Add upgrade of tools to pip installation how-to
fixes #5090
2020-04-17 07:53:48 +02:00
Thomas Waldmann
b5d6e23d84 docs: clarify borg init's encryption modes 2020-04-16 21:35:33 +02:00
Thomas Waldmann
6b3c7165aa build_man 2020-04-12 19:55:57 +02:00
Thomas Waldmann
56c599e6dc build_usage 2020-04-12 19:51:49 +02:00
TW
c867ebfeb6
Merge pull request #5048 from finefoot/patch-8
Option to bypass locking to use sensible borg commands with read-only repositories
2020-04-11 22:18:37 +02:00
finefoot
e49a17143d Add option to bypass locking mechanism 2020-04-11 17:04:52 +02:00
Thalian
d0054f4482 [DOC] linked recommended restrictions to ssh public keys on borg servers in faq, #4946
fixes #4946
2020-04-08 03:02:50 +02:00
Thalian
25ab198d41
[DOCS] #4883 – Doc downplays severity of Nonce reuse issue (#5082)
docs: Borg documentation downplays severity of Nonce reuse issue, fixes #4883
2020-04-05 23:31:08 +02:00
TW
54df299604
Merge pull request #5034 from fantasya-pbem/docs/3428_Restore-after-corruption
docs: borg repo restore instructions needed, fixes #3428
2020-04-05 21:13:25 +02:00
Thomas Waldmann
7dc2a58a93 update CHANGES (master) 2020-04-05 21:00:39 +02:00
Thalian
1d9dadd6b7 [DOCS] #4883 – Borg documentation downplays severity of Nonce reuse issue
Shorten the log info for deleting/keeping security info. Fix bad wording.
2020-04-03 17:40:30 +02:00
Thomas Waldmann
888949c641 Improve description of path variables
Original commit by @finefoot, re-applied due to merge conflict.
2020-04-01 18:54:45 +02:00
Thalian
41ecd1ae30 [DOCS] #3428 – Borg repo restore instructions needed
Adapt FAQ to the new delete option.
2020-03-26 20:02:31 +01:00
Thalian
df67b9ea11 [DOCS] #3428 – Borg repo restore instructions needed
Add new FAQ: A repo is corrupt and must be replaced with an older repo.
2020-03-25 19:56:51 +01:00
Thalian
08a7661e67 [FEATURE] #4489 – Deprecate --nobsdflags option
Replaced by --noflags. In internal data structure the key 'bsdflags' is kept for backwards compatibility.
2020-03-25 06:35:15 +01:00
TW
e388fabd5b
Merge pull request #5057 from fantasya-pbem/docs/2929_Document-delete-data
[DOCS] #2929 – Document how to completely delete data
2020-03-22 22:01:50 +01:00
Thalian
abd81b2ebe Fix broken indent of a list item
This prevents Sphinx WARNING: Bullet list ends without a blank line; unexpected unindent.
2020-03-22 15:17:21 +01:00
Thalian
a08b058fa0 [DOCS] #2929 – Document how to completely delete data
Add new FAQ entry that lists two ways how to really delete files from archives.

fixes #2929
2020-03-20 21:28:40 +01:00
TW
d832c6447c
Merge pull request #5045 from fantasya-pbem/docs/5000_Add-rendering-changes
docs: add "rendering docs" to release todo, fixes #5000
2020-03-20 17:02:13 +01:00
Thalian
19563b968e [DOCS] #4587 – Make Sphinx warnings break docs build
Improve / clean up to trigger CI tests again.
2020-03-20 12:01:52 +01:00
Thalian
a8ecec24c2 [DOCS] #5000 – Add rendering docs to release todo
Add a line regarding checking the markup.
2020-03-18 19:54:03 +01:00
Thalian
19aa9825a8 [DOCS] #4587 – Make Sphinx warnings break docs build
general.rst and man_intro.rst both included usage_general.rst.inc, which resulted in three Sphinx warning "WARNING: duplicate label".
To prevent this we move all sections of usage_general into own include files and add a second usage_general file without the three labels.
2020-03-16 19:22:59 +01:00
Thalian
6990feadb6 [DOCS] #4587 – Make Sphinx warnings break docs build
Remove blank line at top of file.
2020-03-16 19:06:00 +01:00
Thalian
04a25ba108 [DOCS] #4587 – Make Sphinx warnings break docs build
Add blank line to prevent Sphinx warning "WARNING: Explicit markup ends without a blank line; unexpected unindent.".
2020-03-16 19:06:00 +01:00
Thalian
0359b97cce [DOCS] #4587 – Make Sphinx warnings break docs build
Prevent warnings of type "checking consistency... WARNING: document isn't included in any toctree" by using the :orphan: directive.
2020-03-16 19:06:00 +01:00
Thalian
07c89cd794
[DOCS] #4941 – FAQ Borg config dir (#5029)
[DOCS] #4941 – How important is Borg config?

Add one FAQ with for $HOME/.config/borg, describing its content and how to take care of it.

Change "Default to" to "Defaults to".
Move TMPDIR to "Directories and files" section.
Add link to new FAQ for Borg config directory.
Add link to cache internals.
2020-03-16 00:17:46 +01:00
Thalian
0b5bb8dfec [DOCS] #4073 – PlaceholderError not printed as JSON
Add a warning for --log-json option that parsing errors will always be printed as plain text.
2020-03-15 20:37:28 +01:00
TW
c140dc995f
Merge pull request #5025 from milkey-mouse/reflow-docs
Reflow some really long lines in the docs
2020-03-12 02:23:07 +01:00
Milkey Mouse
f7f2493f75
docs: reflow some really long lines
I used `grep -Pnr '.{100}' *.rst` to find lines >100 characters long and
reflowed them where reasonable. Line length in the docs isn't too important (it
doesn't matter once they're compiled), but it's nice not to have super-long
lines in one's editor.
2020-03-11 16:27:57 -07:00
TW
adf77e4f39
Merge pull request #5023 from milkey-mouse/fix-sphinx-warning
Suppress Sphinx lexer warnings in frontends.rst
2020-03-12 00:07:52 +01:00
Milkey Mouse
4e95ad6230
Add updating borgbackup.org/releases to release checklist (fixes #4999) 2020-03-11 15:51:29 -07:00
Milkey Mouse
1edf587bf3
Suppress Sphinx lexer warnings in frontends.rst
Because some of the JSON blocks in frontends.rst included non-JSON
contents (user replies, etc.) the blocks didn't parse/highlight and
`make html` complained:

borg/docs/internals/frontends.rst:28: WARNING: Could not lex literal_block as "json".

There's no easy way to enable and disable highlighting just for
specific lines, but individually unsetting the highlight language per
block suppresses the warnings.
2020-03-11 15:33:44 -07:00
Thomas Waldmann
f74a3958e9 update changes.rst from 1.1-maint branch, fixes #5006
pre-1.1.11 advisory
changelogs of 1.1.10 and 1.1.11
2020-03-09 22:11:14 +01:00
Thomas Waldmann
a8831f4978 fix ProgressIndicator msgids, fixes #4935
add some to code, fix docs.
2020-03-03 23:57:36 +01:00