Merge branch 'develop' into 'main'

Merging develop into main

See merge request !18

templates/backup/config.yaml.twig

@@ -46,4 +46,4 @@ hooks:
   after_backup:
     - echo "`date` - Finished backup"
   on_error:
-    - echo "Error during backup!!! @TODO push something to alerta."
+    - /usr/local/bin/alertalerta.py --pid={{ CI_PROJECT_ID }} {{ HOST_NAME|default('unknown') }} {{ ALERTA_ENVIRONMENT|default("production") }} {{ ALERTA_WEBHOOK|default('https://alerta.lakedrops.com/api') }} {{ ALERTA_APIKEY }} '{"service":["https://www.borgbase.com"],"resource":"{{ HOST_NAME|default('unknown') }}","event":"Borg {configuration_filename}","value":"{repository}","text":"Borg {configuration_filename}","rawData":"{output}"}'

templates/backup/crontab.txt.twig

 {{ backup.crontime }} PATH=$PATH:/usr/bin /usr/bin/borgmatic --stats -v 0 2>&1
+30 23 1 * * PATH=$PATH:/usr/bin /usr/local/bin/borgmatic --check -v 0 2>&1

templates/docker-compose.yml.twig

@@ -492,6 +492,7 @@ services:
     volumes:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
+      - /usr/local/bin/alertalerta.py:/usr/local/bin/alertalerta.py
       - {{ projectrootfiles }}:/mnt/source:ro
       - {{ projectrootbackup }}/files:/mnt/borg-repository
       - {{ projectroot }}/backup:/etc/borgmatic.d/