1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-03-04 02:28:34 +00:00

Fix various code blocks in the docs (#4708)

Fix various code blocks in the docs

- rst markup: put codeblock markup on separate line to make it better visible / separate it from normal text colons.

- borg help texts in archiver.py: put codeblock markup instead of colon - that way it looks like a single colon when using the cli help and also works as code block markup.
This commit is contained in:
ntova 2019-08-09 23:13:11 +02:00 committed by TW
parent fc2c92b054
commit 627ca1376b
8 changed files with 60 additions and 22 deletions

View file

@ -91,16 +91,22 @@ Client
The client needs to initialize the `pictures` repository like this: The client needs to initialize the `pictures` repository like this:
::
borg init backup@backup01.srv.local:pictures borg init backup@backup01.srv.local:pictures
Or with the full path (should actually never be used, as only for demonstrational purposes). Or with the full path (should actually never be used, as only for demonstrational purposes).
The server should automatically change the current working directory to the `<client fqdn>` folder. 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 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. When `johndoe.clnt.local` tries to access a not restricted path the following error is raised.
John Doe tries to backup into the Web 01 path: John Doe tries to backup into the Web 01 path:
::
borg init backup@backup01.srv.local:/home/backup/repos/web01.srv.local/pictures borg init backup@backup01.srv.local:/home/backup/repos/web01.srv.local/pictures
:: ::

View file

@ -42,13 +42,13 @@ SSH access to safe operations only.
with no control characters and that it consists of three parts separated with no control characters and that it consists of three parts separated
by a single space. Ensure that no newlines are contained within the key. by a single space. Ensure that no newlines are contained within the key.
The `restrict` keyword enables all restrictions, i.e. disables port, agent The ``restrict`` keyword enables all restrictions, i.e. disables port, agent
and X11 forwarding, as well as disabling PTY allocation and execution of ~/.ssh/rc. and X11 forwarding, as well as disabling PTY allocation and execution of ~/.ssh/rc.
If any future restriction capabilities are added to authorized_keys If any future restriction capabilities are added to authorized_keys
files they will be included in this set. files they will be included in this set.
The `command` keyword forces execution of the specified command line The ``command`` keyword forces execution of the specified command line
upon login. This must be ``borg serve``. The `--restrict-to-repository` upon login. This must be ``borg serve``. The ``--restrict-to-repository``
option permits access to exactly **one** repository. It can be given option permits access to exactly **one** repository. It can be given
multiple times to permit access to more than one repository. multiple times to permit access to more than one repository.

View file

@ -200,11 +200,15 @@ Running more checks using coala
First install coala and some checkers ("bears"): First install coala and some checkers ("bears"):
::
pip install -r requirements.d/coala.txt pip install -r requirements.d/coala.txt
You can now run coala from the toplevel directory; it will read its settings You can now run coala from the toplevel directory; it will read its settings
from ``.coafile`` there: from ``.coafile`` there:
::
coala coala
Some bears have additional requirements and they usually tell you about Some bears have additional requirements and they usually tell you about
@ -333,13 +337,17 @@ Checklist:
do a fresh start based on that. do a fresh start based on that.
- run tox and/or binary builds on all supported platforms via vagrant, - run tox and/or binary builds on all supported platforms via vagrant,
check for test failures check for test failures
- create sdist, sign it, upload release to (test) PyPi:: - create sdist, sign it, upload release to (test) PyPi:
::
scripts/sdist-sign X.Y.Z scripts/sdist-sign X.Y.Z
scripts/upload-pypi X.Y.Z test scripts/upload-pypi X.Y.Z test
scripts/upload-pypi X.Y.Z scripts/upload-pypi X.Y.Z
- put binaries into dist/borg-OSNAME and sign them: - put binaries into dist/borg-OSNAME and sign them:
::
scripts/sign-binaries 201912312359 scripts/sign-binaries 201912312359
- close the release milestone on GitHub - close the release milestone on GitHub
- announce on: - announce on:

View file

@ -673,7 +673,9 @@ There is no built-in way to limit *download*
(i.e. :ref:`borg_extract`) bandwidth, but limiting download bandwidth (i.e. :ref:`borg_extract`) bandwidth, but limiting download bandwidth
can be accomplished with pipeviewer_: can be accomplished with pipeviewer_:
Create a wrapper script: /usr/local/bin/pv-wrapper :: Create a wrapper script: /usr/local/bin/pv-wrapper
::
#!/bin/sh #!/bin/sh
## -q, --quiet do not output any transfer information at all ## -q, --quiet do not output any transfer information at all
@ -681,11 +683,15 @@ Create a wrapper script: /usr/local/bin/pv-wrapper ::
RATE=307200 RATE=307200
pv -q -L $RATE | "$@" pv -q -L $RATE | "$@"
Add BORG_RSH environment variable to use pipeviewer wrapper script with ssh. :: Add BORG_RSH environment variable to use pipeviewer wrapper script with ssh.
::
export BORG_RSH='/usr/local/bin/pv-wrapper ssh' export BORG_RSH='/usr/local/bin/pv-wrapper ssh'
Now Borg will be bandwidth limited. Nice thing about pv is that you can change rate-limit on the fly: :: Now Borg will be bandwidth limited. Nice thing about pv is that you can change rate-limit on the fly:
::
pv -R $(pidof pv) -L 102400 pv -R $(pidof pv) -L 102400

View file

@ -321,7 +321,9 @@ Using git
~~~~~~~~~ ~~~~~~~~~
This uses latest, unreleased development code from git. This uses latest, unreleased development code from git.
While we try not to break master, there are no guarantees on anything. :: While we try not to break master, there are no guarantees on anything.
::
# get borg from github # get borg from github
git clone https://github.com/borgbackup/borg.git git clone https://github.com/borgbackup/borg.git
@ -342,7 +344,9 @@ While we try not to break master, there are no guarantees on anything. ::
fakeroot -u tox fakeroot -u tox
By default the system installation of python will be used. By default the system installation of python will be used.
If you need to use a different version of Python you can install this using ``pyenv``: :: If you need to use a different version of Python you can install this using ``pyenv``:
::
... ...
# create a virtual environment # create a virtual environment

View file

@ -327,7 +327,7 @@ compression) using N=1 to high compression (and lower speed) using N=22.
zstd is a modern compression algorithm and might be preferable over zlib and zstd is a modern compression algorithm and might be preferable over zlib and
lzma, except if you need compatibility to older borg versions (< 1.1.4) that lzma, except if you need compatibility to older borg versions (< 1.1.4) that
did not yet offer zstd. did not yet offer zstd.::
$ borg create --compression zstd,N /path/to/repo::arch ~ $ borg create --compression zstd,N /path/to/repo::arch ~
@ -338,12 +338,16 @@ If you have a fast repo storage and you want minimum CPU usage, no compression::
$ borg create --compression none /path/to/repo::arch ~ $ borg create --compression none /path/to/repo::arch ~
If you have a less fast repo storage and you want a bit more compression (N=0..9, If you have a less fast repo storage and you want a bit more compression (N=0..9,
0 means no compression, 9 means high compression): :: 0 means no compression, 9 means high compression):
::
$ borg create --compression zlib,N /path/to/repo::arch ~ $ borg create --compression zlib,N /path/to/repo::arch ~
If you have a very slow repo storage and you want high compression (N=0..9, 0 means If you have a very slow repo storage and you want high compression (N=0..9, 0 means
low compression, 9 means high compression): :: low compression, 9 means high compression):
::
$ borg create --compression lzma,N /path/to/repo::arch ~ $ borg create --compression lzma,N /path/to/repo::arch ~

View file

@ -142,14 +142,18 @@ original volumes continue changing the data stored there.
You also add the output of ``lvdisplay`` to your backup, so you can see the LV You also add the output of ``lvdisplay`` to your backup, so you can see the LV
sizes in case you ever need to recreate and restore them. sizes in case you ever need to recreate and restore them.
After the backup has completed, you remove the snapshots again. :: After the backup has completed, you remove the snapshots again.
::
$ # create snapshots here $ # create snapshots here
$ lvdisplay > lvdisplay.txt $ lvdisplay > lvdisplay.txt
$ borg create --read-special /path/to/repo::arch lvdisplay.txt /dev/vg0/*-snapshot $ borg create --read-special /path/to/repo::arch lvdisplay.txt /dev/vg0/*-snapshot
$ # remove snapshots here $ # remove snapshots here
Now, let's see how to restore some LVs from such a backup. :: Now, let's see how to restore some LVs from such a backup.
::
$ borg extract /path/to/repo::arch lvdisplay.txt $ borg extract /path/to/repo::arch lvdisplay.txt
$ # create empty LVs with correct sizes here (look into lvdisplay.txt). $ # create empty LVs with correct sizes here (look into lvdisplay.txt).
@ -204,7 +208,9 @@ append-only is useful for scenarios where a backup client machine backups
remotely to a backup server using ``borg serve``, since a hacked client machine remotely to a backup server using ``borg serve``, since a hacked client machine
cannot delete backups on the server permanently. cannot delete backups on the server permanently.
To activate append-only mode, set ``append_only`` to 1 in the repository config:: To activate append-only mode, set ``append_only`` to 1 in the repository config:
::
borg config /path/to/repo append_only 1 borg config /path/to/repo append_only 1
@ -216,7 +222,9 @@ where each line is a transaction and a UTC timestamp.
In addition, ``borg serve`` can act as if a repository is in append-only mode with In addition, ``borg serve`` can act as if a repository is in append-only mode with
its option ``--append-only``. This can be very useful for fine-tuning access control its option ``--append-only``. This can be very useful for fine-tuning access control
in ``.ssh/authorized_keys`` :: in ``.ssh/authorized_keys``:
::
command="borg serve --append-only ..." ssh-rsa <key used for not-always-trustable backup clients> command="borg serve --append-only ..." ssh-rsa <key used for not-always-trustable backup clients>
command="borg serve ..." ssh-rsa <key used for backup management> command="borg serve ..." ssh-rsa <key used for backup management>
@ -229,7 +237,9 @@ Example
+++++++ +++++++
Suppose an attacker remotely deleted all backups, but your repository was in append-only Suppose an attacker remotely deleted all backups, but your repository was in append-only
mode. A transaction log in this situation might look like this: :: mode. A transaction log in this situation might look like this:
::
transaction 1, UTC time 2016-03-31T15:53:27.383532 transaction 1, UTC time 2016-03-31T15:53:27.383532
transaction 5, UTC time 2016-03-31T15:53:52.588922 transaction 5, UTC time 2016-03-31T15:53:52.588922

View file

@ -2633,7 +2633,7 @@ class Archiver:
Make sure you have free space there, you'll need about 1GB each (+ overhead). Make sure you have free space there, you'll need about 1GB each (+ overhead).
If your repository is encrypted and borg needs a passphrase to unlock the key, use: If your repository is encrypted and borg needs a passphrase to unlock the key, use::
BORG_PASSPHRASE=mysecret borg benchmark crud REPO PATH BORG_PASSPHRASE=mysecret borg benchmark crud REPO PATH
@ -4152,7 +4152,7 @@ class Archiver:
Upgrade should be able to resume if interrupted, although it Upgrade should be able to resume if interrupted, although it
will still iterate over all segments. If you want to start will still iterate over all segments. If you want to start
from scratch, use `borg delete` over the copied repository to from scratch, use `borg delete` over the copied repository to
make sure the cache files are also removed: make sure the cache files are also removed::
borg delete borg borg delete borg