Skip to content

Commit

Permalink
Merge pull request #8377 from AfroThundr3007730/AfroThundr3007730/iss…
Browse files Browse the repository at this point in the history
…ue8361

Update repository URLs in docs to use new syntax
  • Loading branch information
ThomasWaldmann authored Sep 14, 2024
2 parents 5de5367 + 9fe3cb6 commit c278a8e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions docs/deployment/central-backup-server.rst
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ The options which are added to the key will perform the following:
Due to the ``cd`` command we use, the server automatically changes the current
working directory. Then client doesn't need to have knowledge of the absolute
or relative remote repository path and can directly access the repositories at
``<user>@<host>:<repo>``.
``ssh://<user>@<host>/./<repo>``.

.. note:: The setup above ignores all client given commandline parameters
which are normally appended to the `borg serve` command.
Expand All @@ -94,21 +94,21 @@ The client needs to initialize the `pictures` repository like this:

::

borg init backup@backup01.srv.local:pictures
borg init ssh://backup@backup01.srv.local/./pictures

Or with the full path (should actually never be used, as only for demonstration purposes).
The server should automatically change the current working directory to the `<client fqdn>` folder.

::

borg init backup@backup01.srv.local:/home/backup/repos/johndoe.clnt.local/pictures
borg init ssh://backup@backup01.srv.local/home/backup/repos/johndoe.clnt.local/pictures

When `johndoe.clnt.local` tries to access a not restricted path the following error is raised.
John Doe tries to back up into the Web 01 path:

::

borg init backup@backup01.srv.local:/home/backup/repos/web01.srv.local/pictures
borg init ssh://backup@backup01.srv.local/home/backup/repos/web01.srv.local/pictures

::

Expand Down
2 changes: 1 addition & 1 deletion docs/faq.rst
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ Try using ``borg mount`` and ``rsync`` (or a similar tool that supports
resuming a partial file copy from what's already copied).

How can I switch append-only mode on and off?
-----------------------------------------------------------------------------------------------------------------------------------
---------------------------------------------

You could do that (via borg config REPO append_only 0/1), but using different
ssh keys and different entries in ``authorized_keys`` is much easier and also
Expand Down

0 comments on commit c278a8e

Please sign in to comment.