Compare commits

...

4 Commits

6 changed files with 25 additions and 20 deletions

4
NEWS
View File

@ -1,6 +1,6 @@
1.7.6 1.7.6
* #393, #438, #560: Optionally dump "all" PostgreSQL databases to separate files instead of one * #393, #438, #560: Optionally dump "all" PostgreSQL/MySQL databases to separate files instead of
combined dump file, allowing more convenient restores of individual databases. You can enable one combined dump file, allowing more convenient restores of individual databases. You can enable
this by specifying the database dump "format" option when the database is named "all". this by specifying the database dump "format" option when the database is named "all".
* #602: Fix logs that interfere with JSON output by making warnings go to stderr instead of stdout. * #602: Fix logs that interfere with JSON output by making warnings go to stderr instead of stdout.
* #622: Fix traceback when include merging configuration files on ARM64. * #622: Fix traceback when include merging configuration files on ARM64.

View File

@ -1,4 +1,4 @@
FROM alpine:3.16.0 as borgmatic FROM alpine:3.17.1 as borgmatic
COPY . /app COPY . /app
RUN apk add --no-cache py3-pip py3-ruamel.yaml py3-ruamel.yaml.clib RUN apk add --no-cache py3-pip py3-ruamel.yaml py3-ruamel.yaml.clib
@ -8,7 +8,7 @@ RUN borgmatic --help > /command-line.txt \
echo -e "\n--------------------------------------------------------------------------------\n" >> /command-line.txt \ echo -e "\n--------------------------------------------------------------------------------\n" >> /command-line.txt \
&& borgmatic "$action" --help >> /command-line.txt; done && borgmatic "$action" --help >> /command-line.txt; done
FROM node:18.4.0-alpine as html FROM node:19.5.0-alpine as html
ARG ENVIRONMENT=production ARG ENVIRONMENT=production
@ -27,7 +27,7 @@ COPY . /source
RUN NODE_ENV=${ENVIRONMENT} npx eleventy --input=/source/docs --output=/output/docs \ RUN NODE_ENV=${ENVIRONMENT} npx eleventy --input=/source/docs --output=/output/docs \
&& mv /output/docs/index.html /output/index.html && mv /output/docs/index.html /output/index.html
FROM nginx:1.22.0-alpine FROM nginx:1.22.1-alpine
COPY --from=html /output /usr/share/nginx/html COPY --from=html /output /usr/share/nginx/html
COPY --from=borgmatic /etc/borgmatic/config.yaml /usr/share/nginx/html/docs/reference/config.yaml COPY --from=borgmatic /etc/borgmatic/config.yaml /usr/share/nginx/html/docs/reference/config.yaml

View File

@ -240,7 +240,7 @@ To restore all databases:
borgmatic restore --archive host-2023-... --database all borgmatic restore --archive host-2023-... --database all
``` ```
Or just omit the `--database` flag entirely: Or omit the `--database` flag entirely:
```bash ```bash

View File

@ -60,7 +60,15 @@ consistency:
- name: repository - name: repository
``` ```
(Prior to borgmatic 1.6.2, `checks` was a plain list of strings without the `name:` part.) <span class="minilink minilink-addedin">Prior to version 1.6.2</span> `checks`
was a plain list of strings without the `name:` part. For example:
```yaml
consistency:
checks:
- repository
```
Here are the available checks from fastest to slowest: Here are the available checks from fastest to slowest:
@ -125,7 +133,16 @@ consistency:
- name: disabled - name: disabled
``` ```
Or, if you have multiple repositories in your borgmatic configuration file, <span class="minilink minilink-addedin">Prior to version 1.6.2</span> `checks`
was a plain list of strings without the `name:` part. For instance:
```yaml
consistency:
checks:
- disabled
```
If you have multiple repositories in your borgmatic configuration file,
you can keep running consistency checks, but only against a subset of the you can keep running consistency checks, but only against a subset of the
repositories: repositories:

View File

@ -13,9 +13,3 @@ each action sub-command:
``` ```
{% include borgmatic/command-line.txt %} {% include borgmatic/command-line.txt %}
``` ```
## Related documentation
* [Set up backups with borgmatic](https://torsion.org/borgmatic/docs/how-to/set-up-backups/)
* [borgmatic configuration reference](https://torsion.org/borgmatic/docs/reference/configuration/)

View File

@ -15,9 +15,3 @@ 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](https://torsion.org/borgmatic/docs/reference/config.yaml) for use locally. file](https://torsion.org/borgmatic/docs/reference/config.yaml) for use locally.
## Related documentation
* [Set up backups with borgmatic](https://torsion.org/borgmatic/docs/how-to/set-up-backups/)
* [borgmatic command-line reference](https://torsion.org/borgmatic/docs/reference/command-line/)