Merge branch 'master' into logging
This commit is contained in:
commit
02eb6c7e09
12 changed files with 40 additions and 28 deletions
12
README.md
12
README.md
|
@ -82,9 +82,10 @@ providers include specific support for Borg/borgmatic. Using these links and
|
||||||
services helps support borgmatic development and hosting. (These are referral
|
services helps support borgmatic development and hosting. (These are referral
|
||||||
links, but without any tracking scripts or cookies.)
|
links, but without any tracking scripts or cookies.)
|
||||||
|
|
||||||
* [BorgBase](https://www.borgbase.com/?utm_source=borgmatic): Borg hosting
|
<ul>
|
||||||
service with support for monitoring, 2FA, and append-only repos.
|
<li class="referral"><a href="https://www.rsync.net/cgi-bin/borg.cgi?campaign=borg&adgroup=borgmatic">rsync.net</a>: Cloud Storage provider with full support for borg and any other SSH/SFTP tool</li>
|
||||||
|
<li class="referral"><a href="https://www.borgbase.com/?utm_source=borgmatic">BorgBase</a>: Borg hosting service with support for monitoring, 2FA, and append-only repos</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
## Support and contributing
|
## Support and contributing
|
||||||
|
|
||||||
|
@ -115,3 +116,8 @@ your thing. In general, contributions are very welcome. We don't bite!
|
||||||
Also, please check out the [borgmatic development
|
Also, please check out the [borgmatic development
|
||||||
how-to](https://torsion.org/borgmatic/docs/how-to/develop-on-borgmatic/) for
|
how-to](https://torsion.org/borgmatic/docs/how-to/develop-on-borgmatic/) for
|
||||||
info on cloning source code, running tests, etc.
|
info on cloning source code, running tests, etc.
|
||||||
|
|
||||||
|
<script>
|
||||||
|
var links = document.getElementsByClassName("referral");
|
||||||
|
links[Math.floor(Math.random() * links.length)].style.display = "none";
|
||||||
|
</script>
|
||||||
|
|
|
@ -156,7 +156,7 @@ map:
|
||||||
desc: |
|
desc: |
|
||||||
Type of compression to use when creating archives. See
|
Type of compression to use when creating archives. See
|
||||||
https://borgbackup.readthedocs.org/en/stable/usage.html#borg-create for details.
|
https://borgbackup.readthedocs.org/en/stable/usage.html#borg-create for details.
|
||||||
Defaults to no compression.
|
Defaults to "lz4".
|
||||||
example: lz4
|
example: lz4
|
||||||
remote_rate_limit:
|
remote_rate_limit:
|
||||||
type: int
|
type: int
|
||||||
|
|
|
@ -93,4 +93,4 @@ backups.
|
||||||
|
|
||||||
## Related documentation
|
## Related documentation
|
||||||
|
|
||||||
* [Set up backups with borgmatic](../../docs/how-to/set-up-backups.md)
|
* [Set up backups with borgmatic](https://torsion.org/borgmatic/docs/how-to/set-up-backups.md)
|
||||||
|
|
|
@ -109,4 +109,4 @@ also linked from the commits list on each pull request.
|
||||||
|
|
||||||
## Related documentation
|
## Related documentation
|
||||||
|
|
||||||
* [Inspect your backups](../../docs/how-to/inspect-your-backups.md)
|
* [Inspect your backups](https://torsion.org/borgmatic/docs/how-to/inspect-your-backups.md)
|
||||||
|
|
|
@ -42,5 +42,5 @@ output formatted as JSON.
|
||||||
|
|
||||||
## Related documentation
|
## Related documentation
|
||||||
|
|
||||||
* [Set up backups with borgmatic](../../docs/how-to/set-up-backups.md)
|
* [Set up backups with borgmatic](https://torsion.org/borgmatic/docs/how-to/set-up-backups.md)
|
||||||
* [Develop on borgmatic](../../docs/how-to/develop-on-borgmatic.md)
|
* [Develop on borgmatic](https://torsion.org/borgmatic/docs/how-to/develop-on-borgmatic.md)
|
||||||
|
|
|
@ -108,4 +108,4 @@ nested values.
|
||||||
|
|
||||||
## Related documentation
|
## Related documentation
|
||||||
|
|
||||||
* [Set up backups with borgmatic](../../docs/how-to/set-up-backups.md)
|
* [Set up backups with borgmatic](https://torsion.org/borgmatic/docs/how-to/set-up-backups.md)
|
||||||
|
|
|
@ -57,5 +57,5 @@ Like a whole-archive restore, this also restores into the current directory.
|
||||||
|
|
||||||
## Related documentation
|
## Related documentation
|
||||||
|
|
||||||
* [Set up backups with borgmatic](../../docs/how-to/set-up-backups.md)
|
* [Set up backups with borgmatic](https://torsion.org/borgmatic/docs/how-to/set-up-backups.md)
|
||||||
* [Inspect your backups](../../docs/how-to/inspect-your-backups.md)
|
* [Inspect your backups](https://torsion.org/borgmatic/docs/how-to/inspect-your-backups.md)
|
||||||
|
|
|
@ -47,5 +47,5 @@ injection or privilege escalation, do not forget to set secure permissions
|
||||||
|
|
||||||
## Related documentation
|
## Related documentation
|
||||||
|
|
||||||
* [Set up backups with borgmatic](../../docs/how-to/set-up-backups.md)
|
* [Set up backups with borgmatic](https://torsion.org/borgmatic/docs/how-to/set-up-backups.md)
|
||||||
* [Make per-application backups](../../docs/how-to/make-per-application-backups.md)
|
* [Make per-application backups](https://torsion.org/borgmatic/docs/how-to/make-per-application-backups.md)
|
||||||
|
|
|
@ -47,9 +47,10 @@ providers include specific support for Borg/borgmatic. Using these links and
|
||||||
services helps support borgmatic development and hosting. (These are referral
|
services helps support borgmatic development and hosting. (These are referral
|
||||||
links, but without any tracking scripts or cookies.)
|
links, but without any tracking scripts or cookies.)
|
||||||
|
|
||||||
* [BorgBase](https://www.borgbase.com/?utm_source=borgmatic): Borg hosting
|
<ul>
|
||||||
service with support for monitoring, 2FA, and append-only repos.
|
<li class="referral"><a href="https://www.rsync.net/cgi-bin/borg.cgi?campaign=borg&adgroup=borgmatic">rsync.net</a>: Cloud Storage provider with full support for borg and any other SSH/SFTP tool</li>
|
||||||
|
<li class="referral"><a href="https://www.borgbase.com/?utm_source=borgmatic">BorgBase</a>: Borg hosting service with support for monitoring, 2FA, and append-only repos</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
## Configuration
|
## Configuration
|
||||||
|
|
||||||
|
@ -73,7 +74,7 @@ uncomment a particular option, also uncomment its containing section name, or
|
||||||
else borgmatic won't recognize the option.
|
else borgmatic won't recognize the option.
|
||||||
|
|
||||||
You can also get the same sample configuration file from the [configuration
|
You can also get the same sample configuration file from the [configuration
|
||||||
reference](../../docs/reference/configuration.md), the authoritative set of
|
reference](https://torsion.org/borgmatic/docs/reference/configuration.md), the authoritative set of
|
||||||
all configuration options. This is handy if borgmatic has added new options
|
all configuration options. This is handy if borgmatic has added new options
|
||||||
since you originally created your configuration file.
|
since you originally created your configuration file.
|
||||||
|
|
||||||
|
@ -220,8 +221,13 @@ it.
|
||||||
|
|
||||||
## Related documentation
|
## Related documentation
|
||||||
|
|
||||||
* [Make per-application backups](../../docs/how-to/make-per-application-backups.md)
|
* [Make per-application backups](https://torsion.org/borgmatic/docs/how-to/make-per-application-backups.md)
|
||||||
* [Deal with very large backups](../../docs/how-to/deal-with-very-large-backups.md)
|
* [Deal with very large backups](https://torsion.org/borgmatic/docs/how-to/deal-with-very-large-backups.md)
|
||||||
* [Inspect your backups](../../docs/how-to/inspect-your-backups.md)
|
* [Inspect your backups](https://torsion.org/borgmatic/docs/how-to/inspect-your-backups.md)
|
||||||
* [borgmatic configuration reference](../../docs/reference/configuration.md)
|
* [borgmatic configuration reference](https://torsion.org/borgmatic/docs/reference/configuration.md)
|
||||||
* [borgmatic command-line reference](../../docs/reference/command-line.md)
|
* [borgmatic command-line reference](https://torsion.org/borgmatic/docs/reference/command-line.md)
|
||||||
|
|
||||||
|
<script>
|
||||||
|
var links = document.getElementsByClassName("referral");
|
||||||
|
links[Math.floor(Math.random() * links.length)].style.display = "none";
|
||||||
|
</script>
|
||||||
|
|
|
@ -76,4 +76,4 @@ files.
|
||||||
|
|
||||||
## Related documentation
|
## Related documentation
|
||||||
|
|
||||||
* [Develop on borgmatic](../../docs/how-to/develop-on-borgmatic.md)
|
* [Develop on borgmatic](https://torsion.org/borgmatic/docs/how-to/develop-on-borgmatic.md)
|
||||||
|
|
|
@ -12,5 +12,5 @@ Here are all of the available borgmatic command-line options:
|
||||||
|
|
||||||
## Related documentation
|
## Related documentation
|
||||||
|
|
||||||
* [Set up backups with borgmatic](../../docs/how-to/set-up-backups.md)
|
* [Set up backups with borgmatic](https://torsion.org/borgmatic/docs/how-to/set-up-backups.md)
|
||||||
* [borgmatic configuration reference](../../docs/reference/configuration.md)
|
* [borgmatic configuration reference](https://torsion.org/borgmatic/docs/reference/configuration.md)
|
||||||
|
|
|
@ -10,10 +10,10 @@ Here is a full sample borgmatic configuration file including all available optio
|
||||||
```
|
```
|
||||||
|
|
||||||
Note that you can also [download this configuration
|
Note that you can also [download this configuration
|
||||||
file](../../docs/reference/config.yaml) for use locally.
|
file](https://torsion.org/borgmatic/docs/reference/config.yaml) for use locally.
|
||||||
|
|
||||||
|
|
||||||
## Related documentation
|
## Related documentation
|
||||||
|
|
||||||
* [Set up backups with borgmatic](../../docs/how-to/set-up-backups.md)
|
* [Set up backups with borgmatic](https://torsion.org/borgmatic/docs/how-to/set-up-backups.md)
|
||||||
* [borgmatic command-line reference](../../docs/reference/command-line.md)
|
* [borgmatic command-line reference](https://torsion.org/borgmatic/docs/reference/command-line.md)
|
||||||
|
|
Loading…
Reference in a new issue