.drone.yml

@@ -0,0 +1,100 @@
+---
+kind: pipeline
+name: python-3-6-alpine-3-9
+
+services:
+  - name: postgresql
+    image: postgres:11.9-alpine
+    environment:
+      POSTGRES_PASSWORD: test
+      POSTGRES_DB: test
+  - name: mysql
+    image: mariadb:10.3
+    environment:
+      MYSQL_ROOT_PASSWORD: test
+      MYSQL_DATABASE: test
+
+clone:
+  skip_verify: true
+
+steps:
+- name: build
+  image: alpine:3.9
+  pull: always
+  commands:
+    - scripts/run-full-tests
+---
+kind: pipeline
+name: python-3-7-alpine-3-10
+
+services:
+  - name: postgresql
+    image: postgres:11.9-alpine
+    environment:
+      POSTGRES_PASSWORD: test
+      POSTGRES_DB: test
+  - name: mysql
+    image: mariadb:10.3
+    environment:
+      MYSQL_ROOT_PASSWORD: test
+      MYSQL_DATABASE: test
+
+clone:
+  skip_verify: true
+
+steps:
+- name: build
+  image: alpine:3.10
+  pull: always
+  commands:
+    - scripts/run-full-tests
+---
+kind: pipeline
+name: python-3-8-alpine-3-13
+
+services:
+  - name: postgresql
+    image: postgres:13.1-alpine
+    environment:
+      POSTGRES_PASSWORD: test
+      POSTGRES_DB: test
+  - name: mysql
+    image: mariadb:10.5
+    environment:
+      MYSQL_ROOT_PASSWORD: test
+      MYSQL_DATABASE: test
+
+clone:
+  skip_verify: true
+
+steps:
+- name: build
+  image: alpine:3.13
+  pull: always
+  commands:
+    - scripts/run-full-tests
+---
+kind: pipeline
+name: documentation
+
+clone:
+  skip_verify: true
+
+steps:
+- name: build
+  image: plugins/docker
+  settings:
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+    repo: witten/borgmatic-docs
+    dockerfile: docs/Dockerfile
+
+trigger:
+  repo:
+    - borgmatic-collective/borgmatic
+  branch:
+    - master
+  event:
+    - push

.eleventy.js

@@ -1,5 +1,4 @@
 const pluginSyntaxHighlight = require("@11ty/eleventy-plugin-syntaxhighlight");
-const codeClipboard = require("eleventy-plugin-code-clipboard");
 const inclusiveLangPlugin = require("@11ty/eleventy-plugin-inclusive-language");
 const navigationPlugin = require("@11ty/eleventy-navigation");
 
@@ -7,7 +6,6 @@ module.exports = function(eleventyConfig) {
     eleventyConfig.addPlugin(pluginSyntaxHighlight);
     eleventyConfig.addPlugin(inclusiveLangPlugin);
     eleventyConfig.addPlugin(navigationPlugin);
-    eleventyConfig.addPlugin(codeClipboard);
 
     let markdownIt = require("markdown-it");
     let markdownItAnchor = require("markdown-it-anchor");
@@ -25,7 +23,8 @@ module.exports = function(eleventyConfig) {
         }
     };
     let markdownItAnchorOptions = {
-        permalink: markdownItAnchor.permalink.headerLink()
+        permalink: true,
+        permalinkClass: "direct-link"
     };
 
     eleventyConfig.setLibrary(
@@ -33,13 +32,10 @@ module.exports = function(eleventyConfig) {
         markdownIt(markdownItOptions)
             .use(markdownItAnchor, markdownItAnchorOptions)
             .use(markdownItReplaceLink)
-            .use(codeClipboard.markdownItCopyButton)
     );
 
     eleventyConfig.addPassthroughCopy({"docs/static": "static"});
 
-    eleventyConfig.setLiquidOptions({dynamicPartials: false});
-
     return {
         templateFormats: [
           "md",

.flake8

@@ -1 +0,0 @@
-select = Q0

.gitea/issue_template.md

@@ -0,0 +1,35 @@
+#### What I'm trying to do and why
+
+#### Steps to reproduce (if a bug)
+
+Include (sanitized) borgmatic configuration files if applicable.
+
+#### Actual behavior (if a bug)
+
+Include (sanitized) `--verbosity 2` output if applicable.
+
+#### Expected behavior (if a bug)
+
+#### Other notes / implementation ideas
+
+#### Environment
+
+**borgmatic version:** [version here]
+
+Use `sudo borgmatic --version` or `sudo pip show borgmatic | grep ^Version`
+
+**borgmatic installation method:** [e.g., Debian package, Docker container, etc.]
+
+**Borg version:** [version here]
+
+Use `sudo borg --version`
+
+**Python version:** [version here]
+
+Use `python3 --version`
+
+**Database version (if applicable):** [version here]
+
+Use `psql --version` or `mysql --version` on client and server.
+
+**operating system and version:** [OS here]

.gitea/issue_template/bug_template.yaml

@@ -1,77 +0,0 @@
-name: "Bug or question/support"
-about: "For filing a bug or getting support"
-body:
-  - type: textarea
-    id: problem
-    attributes:
-      label: What I'm trying to do and why
-    validations:
-      required: true
-  - type: textarea
-    id: repro_steps
-    attributes:
-      label: Steps to reproduce
-      description: Include (sanitized) borgmatic configuration files if applicable.
-    validations:
-      required: false
-  - type: textarea
-    id: actual_behavior
-    attributes:
-      label: Actual behavior
-      description: Include (sanitized) `--verbosity 2` output if applicable.
-    validations:
-      required: false
-  - type: textarea
-    id: expected_behavior
-    attributes:
-      label: Expected behavior
-    validations:
-      required: false
-  - type: textarea
-    id: notes
-    attributes:
-      label: Other notes / implementation ideas
-    validations:
-      required: false
-  - type: input
-    id: borgmatic_version
-    attributes:
-      label: borgmatic version
-      description: Use `sudo borgmatic --version` or `sudo pip show borgmatic | grep ^Version`
-    validations:
-      required: false
-  - type: input
-    id: borgmatic_install_method
-    attributes:
-      label: borgmatic installation method
-      description: e.g., pip install, Debian package, container, etc.
-    validations:
-      required: false
-  - type: input
-    id: borg_version
-    attributes:
-      label: Borg version
-      description: Use `sudo borg --version`
-    validations:
-      required: false
-  - type: input
-    id: python_version
-    attributes:
-      label: Python version
-      description: Use `python3 --version`
-    validations:
-      required: false
-  - type: input
-    id: database_version
-    attributes:
-      label: Database version (if applicable)
-      description: Use `psql --version` / `mysql --version` / `mongodump --version` / `sqlite3 --version`
-    validations:
-      required: false
-  - type: input
-    id: operating_system_version
-    attributes:
-      label: Operating system and version
-      description: On Linux, use `cat /etc/os-release`
-    validations:
-      required: false

.gitea/issue_template/config.yaml

@@ -1 +0,0 @@
-blank_issues_enabled: true

.gitea/issue_template/feature_template.yaml

@@ -1,15 +0,0 @@
-name: "Feature"
-about: "For filing a feature request or idea"
-body:
-  - type: textarea
-    id: request
-    attributes:
-      label: What I'd like to do and why
-    validations:
-      required: true
-  - type: textarea
-    id: notes
-    attributes:
-      label: Other notes / implementation ideas
-    validations:
-      required: false

.gitea/workflows/build.yaml

@@ -1,28 +0,0 @@
-name: build
-run-name: ${{ gitea.actor }} is building
-on:
-  push:
-    branches: [main]
-
-jobs:
-  test:
-    runs-on: host
-
-    steps:
-      - uses: actions/checkout@v4
-      - run: scripts/run-end-to-end-tests
-
-  docs:
-    needs: [test]
-    runs-on: host
-    env:
-      IMAGE_NAME: projects.torsion.org/borgmatic-collective/borgmatic:docs
-
-    steps:
-      - uses: actions/checkout@v4
-      - run: podman login --username "$USERNAME" --password "$PASSWORD" projects.torsion.org
-        env:
-          USERNAME: "${{ secrets.REGISTRY_USERNAME }}"
-          PASSWORD: "${{ secrets.REGISTRY_PASSWORD }}"
-      - run: podman build --tag "$IMAGE_NAME" --file docs/Dockerfile --storage-opt "overlay.mount_program=/usr/bin/fuse-overlayfs" .
-      - run: podman push "$IMAGE_NAME"

NEWS

@@ -1,609 +1,8 @@
-1.8.15.dev0
- * #911: Add a "key change-passphrase" action to change the passphrase protecting a repository key.
-
-1.8.14
- * #896: Fix an error in borgmatic rcreate/init on an empty repository directory with Borg 1.4.
- * #898: Add glob ("*") support to the "--repository" flag. Just quote any values containing
-   globs so your shell doesn't interpret them.
- * #899: Fix for a "bad character" Borg error in which the "spot" check fed Borg an invalid pattern.
- * #900: Fix for a potential traceback (TypeError) during the handling of another error.
- * #904: Clarify the configuration reference about the "spot" check options:
-   https://torsion.org/borgmatic/docs/reference/configuration/
- * #905: Fix the "source_directories_must_exist" option to work with relative "source_directories"
-   paths when a "working_directory" is set.
- * #906: Add documentation details for how to run custom database dump commands using binaries from
-   running containers:
-   https://torsion.org/borgmatic/docs/how-to/backup-your-databases/#containers
- * Fix a regression in which the "color" option had no effect.
- * Add a recent contributors section to the documentation, because credit where credit's due! See:
-   https://torsion.org/borgmatic/#recent-contributors
-
-1.8.13
- * #298: Add "delete" and "rdelete" actions to delete archives or entire repositories.
- * #785: Add an "only_run_on" option to consistency checks so you can limit a check to running on
-   particular days of the week. See the documentation for more information:
-   https://torsion.org/borgmatic/docs/how-to/deal-with-very-large-backups/#check-days
- * #885: Add an Uptime Kuma monitoring hook. See the documentation for more information:
-   https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/#uptime-kuma-hook
- * #886: Fix a PagerDuty hook traceback with Python < 3.10.
- * #889: Fix the Healthchecks ping body size limit, restoring it to the documented 100,000 bytes.
-
-1.8.12
- * #817: Add a "--max-duration" flag to the "check" action and a "max_duration" option to the
-   repository check configuration. This tells Borg to interrupt a repository check after a certain
-   duration.
- * #860: Fix interaction between environment variable interpolation in constants and shell escaping.
- * #863: When color output is disabled (explicitly or implicitly), don't prefix each log line with
-   the log level.
- * #865: Add an "upload_buffer_size" option to set the size of the upload buffer used in "create"
-   action.
- * #866: Fix "Argument list too long" error in the "spot" check when checking hundreds of thousands
-   of files at once.
- * #874: Add the configured repository label as "repository_label" to the interpolated variables
-   passed to before/after command hooks.
- * #881: Fix "Unrecognized argument" error when the same value is used with different command-line
-   flags.
- * In the "spot" check, don't try to hash symlinked directories.
-
-1.8.11
- * #815: Add optional Healthchecks auto-provisioning via "create_slug" option.
- * #851: Fix lack of file extraction when using "extract --strip-components all" on a path with a
-   leading slash.
- * #854: Fix a traceback when the "data" consistency check is used.
- * #857: Fix a traceback with "check --only spot" when the "spot" check is unconfigured.
-
-1.8.10
- * #656 (beta): Add a "spot" consistency check that compares file counts and contents between your
-   source files and the latest archive, ensuring they fall within configured tolerances. This can
-   catch problems like incorrect excludes, inadvertent deletes, files changed by malware, etc. See
-   the documentation for more information:
-   https://torsion.org/borgmatic/docs/how-to/deal-with-very-large-backups/#spot-check
- * #779: When "--match-archives *" is used with "check" action, don't skip Borg's orphaned objects
-   check.
- * #842: When a command hook exits with a soft failure, ping the log and finish states for any
-   configured monitoring hooks.
- * #843: Add documentation link to Loki dashboard for borgmatic:
-   https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/#loki-hook
- * #847: Fix "--json" error when Borg includes non-JSON warnings in JSON output.
- * #848: SECURITY: Mask the password when logging a MongoDB dump or restore command.
- * Fix handling of the NO_COLOR environment variable to ignore an empty value.
- * Add documentation about backing up containerized databases by configuring borgmatic to exec into
-   a container to run a dump command:
-   https://torsion.org/borgmatic/docs/how-to/backup-your-databases/#containers
-
-1.8.9
- * #311: Add custom dump/restore command options for MySQL and MariaDB.
- * #811: Add an "access_token" option to the ntfy monitoring hook for authenticating
-   without username/password.
- * #827: When the "--json" flag is given, suppress console escape codes so as not to
-   interfere with JSON output.
- * #829: Fix "--override" values containing deprecated section headers not actually overriding
-   configuration options under deprecated section headers.
- * #835: Add support for the NO_COLOR environment variable. See the documentation for more
-   information:
-   https://torsion.org/borgmatic/docs/how-to/set-up-backups/#colored-output
- * #839: Add log sending for the Apprise logging hook, enabled by default. See the documentation for
-   more information:
-   https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/#apprise-hook
- * #839: Document a potentially breaking shell quoting edge case within error hooks:
-   https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/#error-hooks
- * #840: When running the "rcreate" action and the repository already exists but with a different
-   encryption mode than requested, error.
- * Switch from Drone to Gitea Actions for continuous integration.
- * Rename scripts/run-end-to-end-dev-tests to scripts/run-end-to-end-tests and use it in both dev
-   and CI for better dev-CI parity.
- * Clarify documentation about restoring a database: borgmatic does not create the database upon
-   restore.
-
-1.8.8
- * #370: For the PostgreSQL hook, pass the "PGSSLMODE" environment variable through to Borg when the
-   database's configuration omits the "ssl_mode" option.
- * #818: Allow the "--repository" flag to match across multiple configuration files.
- * #820: Fix broken repository detection in the "rcreate" action with Borg 1.4. The issue did not
-   occur with other versions of Borg.
- * #822: Fix broken escaping logic in the PostgreSQL hook's "pg_dump_command" option.
- * SECURITY: Prevent additional shell injection attacks within the PostgreSQL hook.
-
-1.8.7
- * #736: Store included configuration files within each backup archive in support of the "config
-   bootstrap" action. Previously, only top-level configuration files were stored.
- * #798: Elevate specific Borg warnings to errors or squash errors to
- * warnings. See the documentation for more information:
-   https://torsion.org/borgmatic/docs/how-to/customize-warnings-and-errors/
- * #810: SECURITY: Prevent shell injection attacks within the PostgreSQL hook, the MongoDB hook, the
-   SQLite hook, the "borgmatic borg" action, and command hook variable/constant interpolation.
- * #814: Fix a traceback when providing an invalid "--override" value for a list option.
-
-1.8.6
- * #767: Add an "--ssh-command" flag to the "config bootstrap" action for setting a custom SSH
-   command, as no configuration is available (including the "ssh_command" option) until
-   bootstrapping completes.
- * #794: Fix a traceback when the "repositories" option contains both strings and key/value pairs.
- * #800: Add configured repository labels to the JSON output for all actions.
- * #802: The "check --force" flag now runs checks even if "check" is in "skip_actions".
- * #804: Validate the configured action names in the "skip_actions" option.
- * #807: Stream SQLite databases directly to Borg instead of dumping to an intermediate file.
- * When logging commands that borgmatic executes, log the environment variables that
-   borgmatic sets for those commands. (But don't log their values, since they often contain
-   passwords.)
-
-1.8.5
- * #701: Add a "skip_actions" option to skip running particular actions, handy for append-only or
-   checkless configurations. See the documentation for more information:
-   https://torsion.org/borgmatic/docs/how-to/set-up-backups/#skipping-actions
- * #701: Deprecate the "disabled" value for the "checks" option in favor of the new "skip_actions"
-   option.
- * #745: Constants now apply to included configuration, not just the file doing the includes. As a
-   side effect of this change, constants no longer apply to option names and only substitute into
-   configuration values.
- * #779: Add a "--match-archives" flag to the "check" action for selecting the archives to check,
-   overriding the existing "archive_name_format" and "match_archives" options in configuration.
- * #779: Only parse "--override" values as complex data types when they're for options of those
-   types.
- * #782: Fix environment variable interpolation within configured repository paths.
- * #782: Add configuration constant overriding via the existing "--override" flag.
- * #783: Upgrade ruamel.yaml dependency to support version 0.18.x.
- * #784: Drop support for Python 3.7, which has been end-of-lifed.
-
-1.8.4
- * #715: Add a monitoring hook for sending backup status to a variety of monitoring services via the
-   Apprise library. See the documentation for more information:
-   https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/#apprise-hook
- * #748: When an archive filter causes no matching archives for the "rlist" or "info"
-   actions, warn the user and suggest how to remove the filter.
- * #768: Fix a traceback when an invalid command-line flag or action is used.
- * #771: Fix normalization of deprecated sections ("location:", "storage:", "hooks:", etc.) to
-   support empty sections without erroring.
- * #774: Disallow the "--dry-run" flag with the "borg" action, as borgmatic can't guarantee the Borg
-   command won't have side effects.
-
-1.8.3
- * #665: BREAKING: Simplify logging logic as follows: Syslog verbosity is now disabled by
-   default, but setting the "--syslog-verbosity" flag enables it regardless of whether you're at an
-   interactive console. Additionally, "--log-file-verbosity" and "--monitoring-verbosity" now
-   default to 1 (info about steps borgmatic is taking) instead of 0. And both syslog logging and
-   file logging can be enabled simultaneously.
- * #743: Add a monitoring hook for sending backup status and logs to Grafana Loki. See the
-   documentation for more information:
-   https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/#loki-hook
- * #753: When "archive_name_format" is not set, filter archives using the default archive name
-   format.
- * #754: Fix error handling to log command output as one record per line instead of truncating
-   too-long output and swallowing the end of some Borg error messages.
- * #757: Update documentation so "sudo borgmatic" works for pipx borgmatic installations.
- * #761: Fix for borgmatic not stopping Borg immediately when the user presses ctrl-C.
- * Update documentation to recommend installing/upgrading borgmatic with pipx instead of pip. See the
-   documentation for more information:
-   https://torsion.org/borgmatic/docs/how-to/set-up-backups/#installation
-   https://torsion.org/borgmatic/docs/how-to/upgrade/#upgrading-borgmatic
-
-1.8.2
- * #345: Add "key export" action to export a copy of the repository key for safekeeping in case
-   the original goes missing or gets damaged.
- * #727: Add a MariaDB database hook that uses native MariaDB commands instead of the deprecated
-   MySQL ones. Be aware though that any existing backups made with the "mysql_databases:" hook are
-   only restorable with a "mysql_databases:" configuration.
- * #738: Fix for potential data loss (data not getting restored) in which the database "restore"
-   action didn't actually restore anything and indicated success anyway.
- * Remove the deprecated use of the MongoDB hook's "--db" flag for database restoration.
- * Add source code reference documentation for getting oriented with the borgmatic code as a
-   developer: https://torsion.org/borgmatic/docs/reference/source-code/
-
-1.8.1
- * #326: Add documentation for restoring a database to an alternate host:
-   https://torsion.org/borgmatic/docs/how-to/backup-your-databases/#restore-to-an-alternate-host
- * #697: Add documentation for "bootstrap" action:
-   https://torsion.org/borgmatic/docs/how-to/extract-a-backup/#extract-the-configuration-files-used-to-create-an-archive
- * #725: Add "store_config_files" option for disabling the automatic backup of configuration files
-   used by the "config bootstrap" action.
- * #728: Fix for "prune" action error when using the "keep_exclude_tags" option.
- * #730: Fix for Borg's interactive prompt on the "check --repair" action automatically getting
-   answered "NO" even when the "check_i_know_what_i_am_doing" option isn't set.
- * #732: Include multiple configuration files with a single "!include". See the documentation for
-   more information:
-   https://torsion.org/borgmatic/docs/how-to/make-per-application-backups/#multiple-merge-includes
- * #734: Omit "--glob-archives" or "--match-archives" Borg flag when its value would be "*" (meaning
-   all archives).
-
-1.8.0
- * #575: BREAKING: For the "borgmatic borg" action, instead of implicitly injecting
-   repository/archive into the resulting Borg command-line, pass repository to Borg via an
-   environment variable and make archive available for explicit use in your commands. See the
-   documentation for more information:
-   https://torsion.org/borgmatic/docs/how-to/run-arbitrary-borg-commands/
- * #719: Fix an error when running "borg key export" through borgmatic.
- * #720: Fix an error when dumping a database and the "exclude_nodump" option is set.
- * #724: Add "check_i_know_what_i_am_doing" option to bypass Borg confirmation prompt when running
-   "check --repair".
- * When merging two configuration files, error gracefully if the two files do not adhere to the same
-   format.
- * #721: Remove configuration sections ("location:", "storage:", "hooks:", etc.), while still
-   keeping deprecated support for them. Now, all options are at the same level, and you don't need
-   to worry about commenting/uncommenting section headers when you change an option (if you remove
-   your sections first).
- * #721: BREAKING: The retention prefix and the consistency prefix can no longer have different
-   values (unless one is not set).
- * #721: BREAKING: The storage umask and the hooks umask can no longer have different values (unless
-   one is not set).
- * BREAKING: Flags like "--config" that previously took multiple values now need to be given once
-   per value, e.g. "--config first.yaml --config second.yaml" instead of "--config first.yaml
-   second.yaml". This prevents argument parsing errors on ambiguous commands.
- * BREAKING: Remove the deprecated (and silently ignored) "--successful" flag on the "list" action,
-   as newer versions of Borg list successful (non-checkpoint) archives by default.
- * All deprecated configuration option values now generate warning logs.
- * Remove the deprecated (and non-functional) "--excludes" flag in favor of excludes within
-   configuration.
- * Fix an error when logging too-long command output during error handling. Now, long command output
-   is truncated before logging.
-
-1.7.15
- * #326: Add configuration options and command-line flags for backing up a database from one
-   location while restoring it somewhere else.
- * #399: Add a documentation troubleshooting note for MySQL/MariaDB authentication errors.
- * #529: Remove upgrade-borgmatic-config command for upgrading borgmatic 1.1.0 INI-style
-   configuration.
- * #529: Deprecate generate-borgmatic-config in favor of new "config generate" action.
- * #529: Deprecate validate-borgmatic-config in favor of new "config validate" action.
- * #697, #712, #716: Extract borgmatic configuration from backup via new "config bootstrap"
-   action—even when borgmatic has no configuration yet!
- * #669: Add sample systemd user service for running borgmatic as a non-root user.
- * #711, #713: Fix an error when "data" check time files are accessed without getting upgraded
-   first.
-
-1.7.14
- * #484: Add a new verbosity level (-2) to disable output entirely (for console, syslog, log file,
-   or monitoring), so not even errors are shown.
- * #688: Tweak archive check probing logic to use the newest timestamp found when multiple exist.
- * #659: Add Borg 2 date-based matching flags to various actions for archive selection.
- * #703: Fix an error when loading the configuration schema on Fedora Linux.
- * #704: Fix "check" action error when repository and archive checks are configured but the archive
-   check gets skipped due to the configured frequency.
- * #706: Fix "--archive latest" on "list" and "info" actions that only worked on the first of
-   multiple configured repositories.
-
-1.7.13
- * #375: Restore particular PostgreSQL schemas from a database dump via "borgmatic restore --schema"
-   flag. See the documentation for more information:
-   https://torsion.org/borgmatic/docs/how-to/backup-your-databases/#restore-particular-schemas
- * #678: Fix error from PostgreSQL when dumping a database with a "format" of "plain".
- * #678: Fix PostgreSQL hook to support "psql_command" and "pg_restore_command" options containing
-   commands with arguments.
- * #678: Fix calls to psql in PostgreSQL hook to ignore "~/.psqlrc", whose settings can break
-   database dumping.
- * #680: Add support for logging each log line as a JSON object via global "--log-json" flag.
- * #682: Fix "source_directories_must_exist" option to expand globs and tildes in source directories.
- * #684: Rename "master" development branch to "main" to use more inclusive language. You'll need to
-   update your development checkouts accordingly.
- * #686: Add fish shell completion script so you can tab-complete on the borgmatic command-line. See
-   the documentation for more information:
-   https://torsion.org/borgmatic/docs/how-to/set-up-backups/#shell-completion
- * #687: Fix borgmatic error when not finding the configuration schema for certain "pip install
-   --editable" development installs.
- * #688: Fix archive checks being skipped even when particular archives haven't been checked
-   recently. This occurred when using multiple borgmatic configuration files with different
-   "archive_name_format"s, for instance.
- * #691: Fix error in "borgmatic restore" action when the configured repository path is relative
-   instead of absolute.
- * #694: Run "borgmatic borg" action without capturing output so interactive prompts and flags like
-   "--progress" still work.
-
-1.7.12
- * #413: Add "log_file" context to command hooks so your scripts can consume the borgmatic log file.
-   See the documentation for more information:
-   https://torsion.org/borgmatic/docs/how-to/add-preparation-and-cleanup-steps-to-backups/
- * #666, #670: Fix error when running the "info" action with the "--match-archives" or "--archive"
-   flags. Also fix the "--match-archives"/"--archive" flags to correctly override the
-   "match_archives" configuration option for the "transfer", "list", "rlist", and "info" actions.
- * #668: Fix error when running the "prune" action with both "archive_name_format" and "prefix"
-   options set.
- * #672: Selectively shallow merge certain mappings or sequences when including configuration files.
-   See the documentation for more information:
-   https://torsion.org/borgmatic/docs/how-to/make-per-application-backups/#shallow-merge
- * #672: Selectively omit list values when including configuration files. See the documentation for
-   more information:
-   https://torsion.org/borgmatic/docs/how-to/make-per-application-backups/#list-merge
- * #673: View the results of configuration file merging via "validate-borgmatic-config --show" flag.
-   See the documentation for more information:
-   https://torsion.org/borgmatic/docs/how-to/make-per-application-backups/#debugging-includes
- * Add optional support for running end-to-end tests and building documentation with rootless Podman
-   instead of Docker.
-
-1.7.11
- * #479, #588: BREAKING: Automatically use the "archive_name_format" option to filter which archives
-   get used for borgmatic actions that operate on multiple archives. Override this behavior with the
-   new "match_archives" option in the storage section. This change is "breaking" in that it silently
-   changes which archives get considered for "rlist", "prune", "check", etc. See the documentation
-   for more information:
-   https://torsion.org/borgmatic/docs/how-to/make-per-application-backups/#archive-naming
- * #479, #588: The "prefix" options have been deprecated in favor of the new "archive_name_format"
-   auto-matching behavior and the "match_archives" option.
- * #658: Add "--log-file-format" flag for customizing the log message format. See the documentation
-   for more information:
-   https://torsion.org/borgmatic/docs/how-to/inspect-your-backups/#logging-to-file
- * #662: Fix regression in which the "check_repositories" option failed to match repositories.
- * #663: Fix regression in which the "transfer" action produced a traceback.
- * Add spellchecking of source code during test runs.
-
-1.7.10
- * #396: When a database command errors, display and log the error message instead of swallowing it.
- * #501: Optionally error if a source directory does not exist via "source_directories_must_exist"
-   option in borgmatic's location configuration.
- * #576: Add support for "file://" paths within "repositories" option.
- * #612: Define and use custom constants in borgmatic configuration files. See the documentation for
-   more information:
-   https://torsion.org/borgmatic/docs/how-to/make-per-application-backups/#constant-interpolation
- * #618: Add support for BORG_FILES_CACHE_TTL environment variable via "borg_files_cache_ttl" option
-   in borgmatic's storage configuration.
- * #623: Fix confusing message when an error occurs running actions for a configuration file.
- * #635: Add optional repository labels so you can select a repository via "--repository yourlabel"
-   at the command-line. See the configuration reference for more information:
-   https://torsion.org/borgmatic/docs/reference/configuration/
- * #649: Add documentation on backing up a database running in a container:
-   https://torsion.org/borgmatic/docs/how-to/backup-your-databases/#containers
- * #655: Fix error when databases are configured and a source directory doesn't exist.
- * Add code style plugins to enforce use of Python f-strings and prevent single-letter variables.
-   To join in the pedantry, refresh your test environment with "tox --recreate".
- * Rename scripts/run-full-dev-tests to scripts/run-end-to-end-dev-tests and make it run end-to-end
-   tests only. Continue using tox to run unit and integration tests.
-
-1.7.9
- * #295: Add a SQLite database dump/restore hook.
- * #304: Change the default action order when no actions are specified on the command-line to:
-   "create", "prune", "compact", "check". If you'd like to retain the old ordering ("prune" and
-   "compact" first), then specify actions explicitly on the command-line.
- * #304: Run any command-line actions in the order specified instead of using a fixed ordering.
- * #564: Add "--repository" flag to all actions where it makes sense, so you can run borgmatic on
-   a single configured repository instead of all of them.
- * #628: Add a Healthchecks "log" state to send borgmatic logs to Healthchecks without signalling
-   success or failure.
- * #647: Add "--strip-components all" feature on the "extract" action to remove leading path
-   components of files you extract. Must be used with the "--path" flag.
- * Add support for Python 3.11.
-
-1.7.8
- * #620: With the "create" action and the "--list" ("--files") flag, only show excluded files at
-   verbosity 2.
- * #621: Add optional authentication to the ntfy monitoring hook.
- * With the "create" action, only one of "--list" ("--files") and "--progress" flags can be used.
-   This lines up with the new behavior in Borg 2.0.0b5.
- * Internally support new Borg 2.0.0b5 "--filter" status characters / item flags for the "create"
-   action.
- * Fix the "create" action with the "--dry-run" flag querying for databases when a PostgreSQL/MySQL
-   "all" database is configured. Now, these queries are skipped due to the dry run.
- * Add "--repository" flag to the "rcreate" action to optionally select one configured repository to
-   create.
- * Add "--progress" flag to the "transfer" action, new in Borg 2.0.0b5.
- * Add "checkpoint_volume" configuration option to creates checkpoints every specified number of
-   bytes during a long-running backup, new in Borg 2.0.0b5.
-
-1.7.7
- * #642: Add MySQL database hook "add_drop_database" configuration option to control whether dumped
-   MySQL databases get dropped right before restore.
- * #643: Fix for potential data loss (data not getting backed up) when dumping large "directory"
-   format PostgreSQL/MongoDB databases. Prior to the fix, these dumps would not finish writing to
-   disk before Borg consumed them. Now, the dumping process completes before Borg starts. This only
-   applies to "directory" format databases; other formats still stream to Borg without using
-   temporary disk space.
- * Fix MongoDB "directory" format to work with mongodump/mongorestore without error. Prior to this
-   fix, only the "archive" format worked.
-
-1.7.6
- * #393, #438, #560: Optionally dump "all" PostgreSQL/MySQL databases to separate files instead of
-   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".
- * #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.
- * #629: Skip warning about excluded special files when no special files have been excluded.
- * #630: Add configuration options for database command customization: "list_options",
-   "restore_options", and "analyze_options" for PostgreSQL, "restore_options" for MySQL, and
-   "restore_options" for MongoDB.
-
-1.7.5
- * #311: Override PostgreSQL dump/restore commands via configuration options.
- * #604: Fix traceback when a configuration section is present but lacking any options.
- * #607: Clarify documentation examples for include merging and deep merging.
- * #611: Fix "data" consistency check to support "check_last" and consistency "prefix" options.
- * #613: Clarify documentation about multiple repositories and separate configuration files.
-
-1.7.4
- * #596: Fix special file detection erroring when broken symlinks are encountered.
- * #597, #598: Fix regression in which "check" action errored on certain systems ("Cannot determine
-   Borg repository ID").
-
-1.7.3
- * #357: Add "break-lock" action for removing any repository and cache locks leftover from Borg
-   aborting.
- * #360: To prevent Borg hangs, unconditionally delete stale named pipes before dumping databases.
- * #587: When database hooks are enabled, auto-exclude special files from a "create" action to
-   prevent Borg from hanging. You can override/prevent this behavior by explicitly setting the
-   "read_special" option to true.
- * #587: Warn when ignoring a configured "read_special" value of false, as true is needed when
-   database hooks are enabled.
- * #589: Update sample systemd service file to allow system "idle" (e.g. a video monitor turning
-   off) while borgmatic is running.
- * #590: Fix for potential data loss (data not getting backed up) when the "patterns_from" option
-   was used with "source_directories" (or the "~/.borgmatic" path existed, which got injected into
-   "source_directories" implicitly). The fix is for borgmatic to convert "source_directories" into
-   patterns whenever "patterns_from" is used, working around a Borg bug:
-   https://github.com/borgbackup/borg/issues/6994
- * #590: In "borgmatic create --list" output, display which files get excluded from the backup due
-   to patterns or excludes.
- * #591: Add support for Borg 2's "--match-archives" flag. This replaces "--glob-archives", which
-   borgmatic now treats as an alias for "--match-archives". But note that the two flags have
-   slightly different syntax. See the Borg 2 changelog for more information:
-   https://borgbackup.readthedocs.io/en/2.0.0b3/changes.html#version-2-0-0b3-2022-10-02
- * Fix for "borgmatic --archive latest" not finding the latest archive when a verbosity is set.
-
-1.7.2
- * #577: Fix regression in which "borgmatic info --archive ..." showed repository info instead of
-   archive info with Borg 1.
- * #582: Fix hang when database hooks are enabled and "patterns" contains a parent directory of
-   "~/.borgmatic".
-
-1.7.1
- * #542: Make the "source_directories" option optional. This is useful for "check"-only setups or
-   using "patterns" exclusively.
- * #574: Fix for potential data loss (data not getting backed up) when the "patterns" option was
-   used with "source_directories" (or the "~/.borgmatic" path existed, which got injected into
-   "source_directories" implicitly). The fix is for borgmatic to convert "source_directories" into
-   patterns whenever "patterns" is used, working around a Borg bug:
-   https://github.com/borgbackup/borg/issues/6994
-
-1.7.0
- * #463: Add "before_actions" and "after_actions" command hooks that run before/after all the
-   actions for each repository. These new hooks are a good place to run per-repository steps like
-   mounting/unmounting a remote filesystem.
- * #463: Update documentation to cover per-repository configurations:
-   https://torsion.org/borgmatic/docs/how-to/make-per-application-backups/
- * #557: Support for Borg 2 while still working with Borg 1. This includes new borgmatic actions
-   like "rcreate" (replaces "init"), "rlist" (list archives in repository), "rinfo" (show repository
-   info), and "transfer" (for upgrading Borg repositories). For the most part, borgmatic tries to
-   smooth over differences between Borg 1 and 2 to make your upgrade process easier. However, there
-   are still a few cases where Borg made breaking changes. See the Borg 2.0 changelog for more
-   information: https://www.borgbackup.org/releases/borg-2.0.html
- * #557: If you install Borg 2, you'll need to manually upgrade your existing Borg 1 repositories
-   before use. Note that Borg 2 stable is not yet released as of this borgmatic release, so don't
-   use Borg 2 for production until it is! See the documentation for more information:
-   https://torsion.org/borgmatic/docs/how-to/upgrade/#upgrading-borg
- * #557: Rename several configuration options to match Borg 2: "remote_rate_limit" is now
-   "upload_rate_limit", "numeric_owner" is "numeric_ids", and "bsd_flags" is "flags". borgmatic
-   still works with the old options.
- * #557: Remote repository paths without the "ssh://" syntax are deprecated but still supported for
-   now. Remote repository paths containing "~" are deprecated in borgmatic and no longer work in
-   Borg 2.
- * #557: Omitting the "--archive" flag on the "list" action is deprecated when using Borg 2. Use
-   the new "rlist" action instead.
- * #557: The "--dry-run" flag can now be used with the "rcreate"/"init" action.
- * #565: Fix handling of "repository" and "data" consistency checks to prevent invalid Borg flags.
- * #566: Modify "mount" and "extract" actions to require the "--repository" flag when multiple
-   repositories are configured.
- * #571: BREAKING: Remove old-style command-line action flags like "--create, "--list", etc. If
-   you're already using actions like "create" and "list" instead, this change should not affect you.
- * #571: BREAKING: Rename "--files" flag on "prune" action to "--list", as it lists archives, not
-   files.
- * #571: Add "--list" as alias for "--files" flag on "create" and "export-tar" actions.
- * Add support for disabling TLS verification in Healthchecks monitoring hook with "verify_tls"
-   option.
-
-1.6.6
- * #559: Update documentation about configuring multiple consistency checks or multiple databases.
- * #560: Fix all database hooks to error when the requested database to restore isn't present in the
-   Borg archive.
- * #561: Fix command-line "--override" flag to continue supporting old configuration file formats.
- * #563: Fix traceback with "create" action and "--json" flag when a database hook is configured.
-
-1.6.5
- * #553: Fix logging to include the full traceback when Borg experiences an internal error, not just
-   the first few lines.
- * #554: Fix all monitoring hooks to warn if the server returns an HTTP 4xx error. This can happen
-   with Healthchecks, for instance, when using an invalid ping URL.
- * #555: Fix environment variable plumbing so options like "encryption_passphrase" and
-   "encryption_passcommand" in one configuration file aren't used for other configuration files.
-
-1.6.4
- * #546, #382: Keep your repository passphrases and database passwords outside of borgmatic's
-   configuration file with environment variable interpolation. See the documentation for more
-   information: https://torsion.org/borgmatic/docs/how-to/provide-your-passwords/
-
-1.6.3
- * #541: Add "borgmatic list --find" flag for searching for files across multiple archives, useful
-   for hunting down that file you accidentally deleted so you can extract it. See the documentation
-   for more information:
-   https://torsion.org/borgmatic/docs/how-to/inspect-your-backups/#searching-for-a-file
- * #543: Add a monitoring hook for sending push notifications via ntfy. See the documentation for
-   more information: https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/#ntfy-hook
- * Fix Bash completion script to no longer alter your shell's settings (complain about unset
-   variables or error on pipe failures).
- * Deprecate "borgmatic list --successful" flag, as listing only non-checkpoint (successful)
-   archives is now the default in newer versions of Borg.
-
-1.6.2
- * #523: Reduce the default consistency check frequency and support configuring the frequency
-   independently for each check. Also add "borgmatic check --force" flag to ignore configured
-   frequencies. See the documentation for more information:
-   https://torsion.org/borgmatic/docs/how-to/deal-with-very-large-backups/#check-frequency
- * #536: Fix generate-borgmatic-config to support more complex schema changes like the new
-   Healthchecks configuration options when the "--source" flag is used.
- * #538: Add support for "borgmatic borg debug" command.
- * #539: Add "generate-borgmatic-config --overwrite" flag to replace an existing destination file.
- * Add Bash completion script so you can tab-complete the borgmatic command-line. See the
-   documentation for more information:
-   https://torsion.org/borgmatic/docs/how-to/set-up-backups/#shell-completion
-
-1.6.1
- * #294: Add Healthchecks monitoring hook "ping_body_limit" option to configure how many bytes of
-   logs to send to the Healthchecks server.
- * #402: Remove the error when "archive_name_format" is specified but a retention prefix isn't. 
- * #420: Warn when an unsupported variable is used in a hook command.
- * #439: Change connection failures for monitoring hooks (Healthchecks, Cronitor, PagerDuty, and
-   Cronhub) to be warnings instead of errors. This way, the monitoring system failing does not block
-   backups.
- * #460: Add Healthchecks monitoring hook "send_logs" option to enable/disable sending borgmatic
-   logs to the Healthchecks server.
- * #525: Add Healthchecks monitoring hook "states" option to only enable pinging for particular
-   monitoring states (start, finish, fail).
- * #528: Improve the error message when a configuration override contains an invalid value.
- * #531: BREAKING: When deep merging common configuration, merge colliding list values by appending
-   them. Previously, one list replaced the other.
- * #532: When a configuration include is a relative path, load it from either the current working
-   directory or from the directory containing the file doing the including. Previously, only the
-   working directory was used.
- * Add a randomized delay to the sample systemd timer to spread out the load on a server.
- * Change the configuration format for borgmatic monitoring hooks (Healthchecks, Cronitor,
-   PagerDuty, and Cronhub) to specify the ping URL / integration key as a named option. The intent
-   is to support additional options (some in this release). This change is backwards-compatible.
- * Add emojis to documentation table of contents to make it easier to find particular how-to and
-   reference guides at a glance.
-
-1.6.0
- * #381: BREAKING: Greatly simplify configuration file reuse by deep merging when including common
-   configuration. See the documentation for more information:
-   https://torsion.org/borgmatic/docs/how-to/make-per-application-backups/#include-merging
- * #473: BREAKING: Instead of executing "before" command hooks before all borgmatic actions run (and
-   "after" hooks after), execute these hooks right before/after the corresponding action. E.g.,
-   "before_check" now runs immediately before the "check" action. This better supports running
-   timing-sensitive tasks like pausing containers. Side effect: before/after command hooks now run
-   once for each configured repository instead of once per configuration file. Additionally, the
-   "repositories" interpolated variable has been changed to "repository", containing the path to the
-   current repository for the hook. See the documentation for more information:
-   https://torsion.org/borgmatic/docs/how-to/add-preparation-and-cleanup-steps-to-backups/
- * #513: Add mention of sudo's "secure_path" option to borgmatic installation documentation.
- * #515: Fix "borgmatic borg key ..." to pass parameters to Borg in the correct order.
- * #516: Fix handling of TERM signal to exit borgmatic, not just forward the signal to Borg.
- * #517: Fix borgmatic exit code (so it's zero) when initial Borg calls fail but later retries
-   succeed.
- * Change Healthchecks logs truncation size from 10k bytes to 100k bytes, corresponding to that
-   same change on Healthchecks.io.
-
-1.5.24
- * #431: Add "working_directory" option to support source directories with relative paths.
- * #444: When loading a configuration file that is unreadable due to file permissions, warn instead
-   of erroring. This supports running borgmatic as a non-root user with configuration in ~/.config
-   even if there is an unreadable global configuration file in /etc.
- * #469: Add "repositories" context to "before_*" and "after_*" command action hooks. See the
-   documentation for more information:
-   https://torsion.org/borgmatic/docs/how-to/add-preparation-and-cleanup-steps-to-backups/
- * #486: Fix handling of "patterns_from" and "exclude_from" options to error instead of warning when
-   referencing unreadable files and "create" action is run.
- * #507: Fix Borg usage error in the "compact" action when running "borgmatic --dry-run". Now, skip
-   "compact" entirely during a dry run.
-
-1.5.23
- * #394: Compact repository segments and free space with new "borgmatic compact" action. Borg 1.2+
-   only. Also run "compact" by default when no actions are specified, as "prune" in Borg 1.2 no
-   longer frees up space unless "compact" is run.
- * #394: When using the "atime", "bsd_flags", "numeric_owner", or "remote_rate_limit" options,
-   tailor the flags passed to Borg depending on the Borg version.
- * #480, #482: Fix traceback when a YAML validation error occurs.
-
-1.5.22
- * #288: Add database dump hook for MongoDB.
+1.5.22.dev0
  * #470: Move mysqldump options to the beginning of the command due to MySQL bug 30994.
  * #471: When command-line configuration override produces a parse error, error cleanly instead of
    tracebacking.
  * #476: Fix unicode error when restoring particular MySQL databases.
- * Drop support for Python 3.6, which has been end-of-lifed.
- * Add support for Python 3.10.
 
 1.5.21
  * #28: Optionally retry failing backups via "retries" and "retry_wait" configuration options.
@@ -651,7 +50,7 @@
  * #398: Clarify canonical home of borgmatic in documentation.
  * #406: Clarify that spaces in path names should not be backslashed in path names.
  * #423: Fix error handling to error loudly when Borg gets killed due to running out of memory!
- * Fix build so as not to attempt to build and push documentation for a non-main branch.
+ * Fix build so as not to attempt to build and push documentation for a non-master branch.
  * "Fix" build failure with Alpine Edge by switching from Edge to Alpine 3.13.
  * Move #borgmatic IRC channel from Freenode to Libera Chat due to Freenode takeover drama.
    IRC connection info: https://torsion.org/borgmatic/#issues
@@ -714,7 +113,7 @@
    configuration schema descriptions.
 
 1.5.6
- * #292: Allow before_backup and similar hooks to exit with a soft failure without altering the
+ * #292: Allow before_backup and similiar hooks to exit with a soft failure without altering the
    monitoring status on Healthchecks or other providers. Support this by waiting to ping monitoring
    services with a "start" status until after before_* hooks finish. Failures in before_* hooks
    still trigger a monitoring "fail" status.
@@ -783,7 +182,7 @@
  * For "list" and "info" actions, show repository names even at verbosity 0.
 
 1.4.22
- * #276, #285: Disable colored output when "--json" flag is used, so as to produce valid JSON output.
+ * #276, #285: Disable colored output when "--json" flag is used, so as to produce valid JSON ouput.
  * After a backup of a database dump in directory format, properly remove the dump directory.
  * In "borgmatic --help", don't expand $HOME in listing of default "--config" paths.
 
@@ -1155,7 +554,7 @@
  * #77: Skip non-"*.yaml" config filenames in /etc/borgmatic.d/ so as not to parse backup files,
    editor swap files, etc.
  * #81: Document user-defined hooks run before/after backup, or on error.
- * Add code style guidelines to the documentation.
+ * Add code style guidelines to the documention.
 
 1.2.0
  * #61: Support for Borg --list option via borgmatic command-line to list all archives.

README.md

@@ -11,65 +11,67 @@ borgmatic is simple, configuration-driven backup software for servers and
 workstations. Protect your files with client-side encryption. Backup your
 databases too. Monitor it all with integrated third-party services.
 
-The canonical home of borgmatic is at <a href="https://torsion.org/borgmatic">https://torsion.org/borgmatic/</a>
+The canonical home of borgmatic is at <a href="https://torsion.org/borgmatic">https://torsion.org/borgmatic</a>.
 
 Here's an example configuration file:
 
 ```yaml
-# List of source directories to backup.
-source_directories:
-    - /home
-    - /etc
+location:
+    # List of source directories to backup.
+    source_directories:
+        - /home
+        - /etc
 
-# Paths of local or remote repositories to backup to.
-repositories:
-    - path: ssh://k8pDxu32@k8pDxu32.repo.borgbase.com/./repo
-      label: borgbase
-    - path: /var/lib/backups/local.borg
-      label: local
+    # Paths of local or remote repositories to backup to.
+    repositories:
+        - 1234@usw-s001.rsync.net:backups.borg
+        - k8pDxu32@k8pDxu32.repo.borgbase.com:repo
+        - user1@scp2.cdn.lima-labs.com:repo
+        - /var/lib/backups/local.borg
 
-# Retention policy for how many backups to keep.
-keep_daily: 7
-keep_weekly: 4
-keep_monthly: 6
+retention:
+    # Retention policy for how many backups to keep.
+    keep_daily: 7
+    keep_weekly: 4
+    keep_monthly: 6
 
-# List of checks to run to validate your backups.
-checks:
-    - name: repository
-    - name: archives
-      frequency: 2 weeks
+consistency:
+    # List of checks to run to validate your backups.
+    checks:
+        - repository
+        - archives
 
-# Custom preparation scripts to run.
-before_backup:
-    - prepare-for-backup.sh
+hooks:
+    # Custom preparation scripts to run.
+    before_backup:
+        - prepare-for-backup.sh
 
-# Databases to dump and include in backups.
-postgresql_databases:
-    - name: users
+    # Databases to dump and include in backups.
+    postgresql_databases:
+        - name: users
 
-# Third-party services to notify you if backups aren't happening.
-healthchecks:
-    ping_url: https://hc-ping.com/be067061-cf96-4412-8eae-62b0c50d6a8c
+    # Third-party services to notify you if backups aren't happening.
+    healthchecks: https://hc-ping.com/be067061-cf96-4412-8eae-62b0c50d6a8c
 ```
 
+Want to see borgmatic in action? Check out the <a
+href="https://asciinema.org/a/203761?autoplay=1" target="_blank">screencast</a>.
+
+<a href="https://asciinema.org/a/203761?autoplay=1" target="_blank"><img src="https://asciinema.org/a/203761.png" width="480"></a>
+
 borgmatic is powered by [Borg Backup](https://www.borgbackup.org/).
 
 ## Integrations
 
-<a href="https://www.postgresql.org/"><img src="docs/static/postgresql.png" alt="PostgreSQL" height="60px" style="margin-bottom:20px; margin-right:20px;"></a>
-<a href="https://www.mysql.com/"><img src="docs/static/mysql.png" alt="MySQL" height="60px" style="margin-bottom:20px; margin-right:20px;"></a>
-<a href="https://mariadb.com/"><img src="docs/static/mariadb.png" alt="MariaDB" height="60px" style="margin-bottom:20px; margin-right:20px;"></a>
-<a href="https://www.mongodb.com/"><img src="docs/static/mongodb.png" alt="MongoDB" height="60px" style="margin-bottom:20px; margin-right:20px;"></a>
-<a href="https://sqlite.org/"><img src="docs/static/sqlite.png" alt="SQLite" height="60px" style="margin-bottom:20px; margin-right:20px;"></a>
-<a href="https://healthchecks.io/"><img src="docs/static/healthchecks.png" alt="Healthchecks" height="60px" style="margin-bottom:20px; margin-right:20px;"></a>
-<a href="https://uptime.kuma.pet/"><img src="docs/static/uptimekuma.png" alt="Uptime Kuma" height="60px" style="margin-bottom:20px; margin-right:20px;"></a>
-<a href="https://cronitor.io/"><img src="docs/static/cronitor.png" alt="Cronitor" height="60px" style="margin-bottom:20px; margin-right:20px;"></a>
-<a href="https://cronhub.io/"><img src="docs/static/cronhub.png" alt="Cronhub" height="60px" style="margin-bottom:20px; margin-right:20px;"></a>
-<a href="https://www.pagerduty.com/"><img src="docs/static/pagerduty.png" alt="PagerDuty" height="60px" style="margin-bottom:20px; margin-right:20px;"></a>
-<a href="https://ntfy.sh/"><img src="docs/static/ntfy.png" alt="ntfy" height="60px" style="margin-bottom:20px; margin-right:20px;"></a>
-<a href="https://grafana.com/oss/loki/"><img src="docs/static/loki.png" alt="Loki" height="60px" style="margin-bottom:20px; margin-right:20px;"></a>
-<a href="https://github.com/caronc/apprise/wiki"><img src="docs/static/apprise.png" alt="Apprise" height="60px" style="margin-bottom:20px; margin-right:20px;"></a>
-<a href="https://www.borgbase.com/?utm_source=borgmatic"><img src="docs/static/borgbase.png" alt="BorgBase" height="60px" style="margin-bottom:20px; margin-right:20px;"></a>
+<a href="https://www.postgresql.org/"><img src="docs/static/postgresql.png" alt="PostgreSQL" height="60px" style="margin-bottom:20px;"></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<a href="https://www.mysql.com/"><img src="docs/static/mysql.png" alt="MySQL" height="60px" style="margin-bottom:20px;"></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<a href="https://mariadb.com/"><img src="docs/static/mariadb.png" alt="MariaDB" height="60px" style="margin-bottom:20px;"></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<a href="https://healthchecks.io/"><img src="docs/static/healthchecks.png" alt="Healthchecks" height="60px" style="margin-bottom:20px;"></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<a href="https://cronitor.io/"><img src="docs/static/cronitor.png" alt="Cronitor" height="60px" style="margin-bottom:20px;"></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<a href="https://cronhub.io/"><img src="docs/static/cronhub.png" alt="Cronhub" height="60px" style="margin-bottom:20px;"></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<a href="https://www.pagerduty.com/"><img src="docs/static/pagerduty.png" alt="PagerDuty" height="60px" style="margin-bottom:20px;"></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<a href="https://www.rsync.net/cgi-bin/borg.cgi?campaign=borg&adgroup=borgmatic"><img src="docs/static/rsyncnet.png" alt="rsync.net" height="60px" style="margin-bottom:20px;"></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<a href="https://www.borgbase.com/?utm_source=borgmatic"><img src="docs/static/borgbase.png" alt="BorgBase" height="60px" style="margin-bottom:20px;"></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
 ## Getting started
@@ -77,8 +79,8 @@ borgmatic is powered by [Borg Backup](https://www.borgbackup.org/).
 Your first step is to [install and configure
 borgmatic](https://torsion.org/borgmatic/docs/how-to/set-up-backups/).
 
-For additional documentation, check out the links above (left panel on wide screens)
-for <a href="https://torsion.org/borgmatic/#documentation">borgmatic how-to and
+For additional documentation, check out the links above for <a
+href="https://torsion.org/borgmatic/#documentation">borgmatic how-to and
 reference guides</a>.
 
 
@@ -86,49 +88,39 @@ reference guides</a>.
 
 Need somewhere to store your encrypted off-site backups? The following hosting
 providers include specific support for Borg/borgmatic—and fund borgmatic
-development and hosting when you use these referral links to sign up:
+development and hosting when you use these links to sign up. (These are
+referral links, but without any tracking scripts or cookies.)
 
 <ul>
  <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>
- <li class="referral"><a href="https://hetzner.cloud/?ref=v9dOJ98Ic9I8">Hetzner</a>: A "storage box" that includes support for Borg</li>
+ <li class="referral"><a href="https://storage.lima-labs.com/special-pricing-offer-for-borgmatic-users/">Lima-Labs</a>: Affordable, reliable cloud data storage accessable via SSH/SCP/FTP for Borg backups or any other bulk storage needs</li>
 </ul>
 
-Additionally, rsync.net has a compatible storage offering, but does not fund
-borgmatic development or hosting.
+Additionally, [rsync.net](https://www.rsync.net/products/borg.html) and
+[Hetzner](https://www.hetzner.com/storage/storage-box) have compatible storage
+offerings, but do not currently fund borgmatic development or hosting.
 
 ## Support and contributing
 
 ### Issues
 
-Are you experiencing an issue with borgmatic? Or do you have an idea for a
-feature enhancement? Head on over to our [issue
-tracker](https://projects.torsion.org/borgmatic-collective/borgmatic/issues).
-In order to create a new issue or add a comment, you'll need to
-[register](https://projects.torsion.org/user/sign_up?invite_code=borgmatic)
-first. If you prefer to use an existing GitHub account, you can skip account
-creation and [login directly](https://projects.torsion.org/user/login).
+You've got issues? Or an idea for a feature enhancement? We've got an [issue
+tracker](https://projects.torsion.org/borgmatic-collective/borgmatic/issues). In order to
+create a new issue or comment on an issue, you'll need to [login
+first](https://projects.torsion.org/user/login). Note that you can login with
+an existing GitHub account if you prefer.
+
+If you'd like to chat with borgmatic developers or users, head on over to the
+`#borgmatic` IRC channel on Libera Chat, either via <a
+href="https://web.libera.chat/#borgmatic">web chat</a> or a
+native <a href="ircs://irc.libera.chat:6697">IRC client</a>. If you
+don't get a response right away, please hang around a while—or file a ticket
+instead.
 
 Also see the [security
 policy](https://torsion.org/borgmatic/docs/security-policy/) for any security
 issues.
 
-
-### Social
-
-Follow [borgmatic on Mastodon](https://fosstodon.org/@borgmatic).
-
-
-### Chat
-
-To chat with borgmatic developers or users, check out the `#borgmatic`
-IRC channel on Libera Chat, either via <a
-href="https://web.libera.chat/#borgmatic">web chat</a> or a native <a
-href="ircs://irc.libera.chat:6697">IRC client</a>. If you don't get a response
-right away, please hang around a while—or file a ticket instead.
-
-
-### Other
-
 Other questions or comments? Contact
 [witten@torsion.org](mailto:witten@torsion.org).
 
@@ -143,19 +135,14 @@ borgmatic is licensed under the GNU General Public License version 3 or any
 later version.
 
 If you'd like to contribute to borgmatic development, please feel free to
-submit a [Pull
-Request](https://projects.torsion.org/borgmatic-collective/borgmatic/pulls) or
-open an
-[issue](https://projects.torsion.org/borgmatic-collective/borgmatic/issues) to
-discuss your idea. Note that you'll need to
-[register](https://projects.torsion.org/user/sign_up?invite_code=borgmatic)
-first. We also accept Pull Requests on GitHub, if that's more your thing. In
-general, contributions are very welcome. We don't bite!
+submit a [Pull Request](https://projects.torsion.org/borgmatic-collective/borgmatic/pulls)
+or open an [issue](https://projects.torsion.org/borgmatic-collective/borgmatic/issues) first
+to discuss your idea. We also accept Pull Requests on GitHub, if that's more
+your thing. In general, contributions are very welcome. We don't bite! 
 
 Also, please check out the [borgmatic development
 how-to](https://torsion.org/borgmatic/docs/how-to/develop-on-borgmatic/) for
 info on cloning source code, running tests, etc.
 
-### Recent contributors
+<a href="https://build.torsion.org/borgmatic-collective/borgmatic" alt="build status">![Build Status](https://build.torsion.org/api/badges/borgmatic-collective/borgmatic/status.svg?ref=refs/heads/master)</a>
 
-{% include borgmatic/contributors.html %}

SECURITY.md

@@ -7,8 +7,8 @@ permalink: security-policy/index.html
 
 While we want to hear about security vulnerabilities in all versions of
 borgmatic, security fixes are only made to the most recently released version.
-It's not practical for our small volunteer effort to maintain multiple release
-branches and put out separate security patches for each.
+It's simply not practical for our small volunteer effort to maintain multiple
+release branches and put out separate security patches for each.
 
 ## Reporting a vulnerability
 

borgmatic/actions/arguments.py

@@ -1,9 +0,0 @@
-import argparse
-
-
-def update_arguments(arguments, **updates):
-    '''
-    Given an argparse.Namespace instance of command-line arguments and one or more keyword argument
-    updates to perform, return a copy of the arguments with those updates applied.
-    '''
-    return argparse.Namespace(**dict(vars(arguments), **updates))

borgmatic/actions/borg.py

@@ -1,45 +0,0 @@
-import logging
-
-import borgmatic.borg.borg
-import borgmatic.borg.rlist
-import borgmatic.config.validate
-
-logger = logging.getLogger(__name__)
-
-
-def run_borg(
-    repository,
-    config,
-    local_borg_version,
-    borg_arguments,
-    global_arguments,
-    local_path,
-    remote_path,
-):
-    '''
-    Run the "borg" action for the given repository.
-    '''
-    if borg_arguments.repository is None or borgmatic.config.validate.repositories_match(
-        repository, borg_arguments.repository
-    ):
-        logger.info(
-            f'{repository.get("label", repository["path"])}: Running arbitrary Borg command'
-        )
-        archive_name = borgmatic.borg.rlist.resolve_archive_name(
-            repository['path'],
-            borg_arguments.archive,
-            config,
-            local_borg_version,
-            global_arguments,
-            local_path,
-            remote_path,
-        )
-        borgmatic.borg.borg.run_arbitrary_borg(
-            repository['path'],
-            config,
-            local_borg_version,
-            options=borg_arguments.options,
-            archive=archive_name,
-            local_path=local_path,
-            remote_path=remote_path,
-        )

borgmatic/actions/break_lock.py

@@ -1,34 +0,0 @@
-import logging
-
-import borgmatic.borg.break_lock
-import borgmatic.config.validate
-
-logger = logging.getLogger(__name__)
-
-
-def run_break_lock(
-    repository,
-    config,
-    local_borg_version,
-    break_lock_arguments,
-    global_arguments,
-    local_path,
-    remote_path,
-):
-    '''
-    Run the "break-lock" action for the given repository.
-    '''
-    if break_lock_arguments.repository is None or borgmatic.config.validate.repositories_match(
-        repository, break_lock_arguments.repository
-    ):
-        logger.info(
-            f'{repository.get("label", repository["path"])}: Breaking repository and cache locks'
-        )
-        borgmatic.borg.break_lock.break_lock(
-            repository['path'],
-            config,
-            local_borg_version,
-            global_arguments,
-            local_path=local_path,
-            remote_path=remote_path,
-        )

borgmatic/actions/change_passphrase.py

@@ -1,38 +0,0 @@
-import logging
-
-import borgmatic.borg.change_passphrase
-import borgmatic.config.validate
-
-logger = logging.getLogger(__name__)
-
-
-def run_change_passphrase(
-    repository,
-    config,
-    local_borg_version,
-    change_passphrase_arguments,
-    global_arguments,
-    local_path,
-    remote_path,
-):
-    '''
-    Run the "key change-passprhase" action for the given repository.
-    '''
-    if (
-        change_passphrase_arguments.repository is None
-        or borgmatic.config.validate.repositories_match(
-            repository, change_passphrase_arguments.repository
-        )
-    ):
-        logger.info(
-            f'{repository.get("label", repository["path"])}: Changing repository passphrase'
-        )
-        borgmatic.borg.change_passphrase.change_passphrase(
-            repository['path'],
-            config,
-            local_borg_version,
-            change_passphrase_arguments,
-            global_arguments,
-            local_path=local_path,
-            remote_path=remote_path,
-        )

borgmatic/actions/check.py

@@ -1,728 +0,0 @@
-import calendar
-import datetime
-import hashlib
-import itertools
-import logging
-import os
-import pathlib
-import random
-
-import borgmatic.borg.check
-import borgmatic.borg.create
-import borgmatic.borg.environment
-import borgmatic.borg.extract
-import borgmatic.borg.list
-import borgmatic.borg.rlist
-import borgmatic.borg.state
-import borgmatic.config.validate
-import borgmatic.execute
-import borgmatic.hooks.command
-
-DEFAULT_CHECKS = (
-    {'name': 'repository', 'frequency': '1 month'},
-    {'name': 'archives', 'frequency': '1 month'},
-)
-
-
-logger = logging.getLogger(__name__)
-
-
-def parse_checks(config, only_checks=None):
-    '''
-    Given a configuration dict with a "checks" sequence of dicts and an optional list of override
-    checks, return a tuple of named checks to run.
-
-    For example, given a config of:
-
-        {'checks': ({'name': 'repository'}, {'name': 'archives'})}
-
-    This will be returned as:
-
-        ('repository', 'archives')
-
-    If no "checks" option is present in the config, return the DEFAULT_CHECKS. If a checks value
-    has a name of "disabled", return an empty tuple, meaning that no checks should be run.
-    '''
-    checks = only_checks or tuple(
-        check_config['name'] for check_config in (config.get('checks', None) or DEFAULT_CHECKS)
-    )
-    checks = tuple(check.lower() for check in checks)
-
-    if 'disabled' in checks:
-        logger.warning(
-            'The "disabled" value for the "checks" option is deprecated and will be removed from a future release; use "skip_actions" instead'
-        )
-        if len(checks) > 1:
-            logger.warning(
-                'Multiple checks are configured, but one of them is "disabled"; not running any checks'
-            )
-        return ()
-
-    return checks
-
-
-def parse_frequency(frequency):
-    '''
-    Given a frequency string with a number and a unit of time, return a corresponding
-    datetime.timedelta instance or None if the frequency is None or "always".
-
-    For instance, given "3 weeks", return datetime.timedelta(weeks=3)
-
-    Raise ValueError if the given frequency cannot be parsed.
-    '''
-    if not frequency:
-        return None
-
-    frequency = frequency.strip().lower()
-
-    if frequency == 'always':
-        return None
-
-    try:
-        number, time_unit = frequency.split(' ')
-        number = int(number)
-    except ValueError:
-        raise ValueError(f"Could not parse consistency check frequency '{frequency}'")
-
-    if not time_unit.endswith('s'):
-        time_unit += 's'
-
-    if time_unit == 'months':
-        number *= 30
-        time_unit = 'days'
-    elif time_unit == 'years':
-        number *= 365
-        time_unit = 'days'
-
-    try:
-        return datetime.timedelta(**{time_unit: number})
-    except TypeError:
-        raise ValueError(f"Could not parse consistency check frequency '{frequency}'")
-
-
-WEEKDAY_DAYS = calendar.day_name[0:5]
-WEEKEND_DAYS = calendar.day_name[5:7]