From 68b73990b4f35873dd1ceaf6ced764deb4d393f5 Mon Sep 17 00:00:00 2001
From: Nick Stokoe <git.wu-lee@noodlefactory.co.uk>
Date: Thu, 6 Apr 2023 16:43:02 +0100
Subject: [PATCH] borgmatic config.yaml - set the archive label meaningfully

Currently {hostname} expands to an anonymous number. Set this part of
the archive name to something we can recognise.
---
 templates/docker-compose/docker-compose.yml                   | 1 +
 templates/docker-compose/volumes/borgmatic-config/config.yaml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/docker-compose/docker-compose.yml b/templates/docker-compose/docker-compose.yml
index 6e3731f..80aaa23 100644
--- a/templates/docker-compose/docker-compose.yml
+++ b/templates/docker-compose/docker-compose.yml
@@ -242,6 +242,7 @@ services:
       POSTGRES_DB: nextcloud
       POSTGRES_HOST: postgres
       BORG_ARCHIVE: nick
+      BORG_ARCHIVE_LABEL: snackpot
       MAIL_RELAY_HOST: mail.noodlefactory.co.uk
       MAIL_PORT: 25
       MAIL_AUTH_METHOD: login
diff --git a/templates/docker-compose/volumes/borgmatic-config/config.yaml b/templates/docker-compose/volumes/borgmatic-config/config.yaml
index f99037c..1706b85 100644
--- a/templates/docker-compose/volumes/borgmatic-config/config.yaml
+++ b/templates/docker-compose/volumes/borgmatic-config/config.yaml
@@ -231,7 +231,7 @@ storage:
   # pruning/checking of archives with different archive name
   # formats.
   # archive_name_format: '{hostname}-documents-{now}'
-  archive_name_format: '{hostname}-{now:%Y-%m-%dT%H:%M:%S.%f}'
+  archive_name_format: "${BORG_ARCHIVE_LABEL}-{now:%Y-%m-%dT%H:%M:%S.%f}"
   
   # Bypass Borg error about a repository that has been moved.
   # Defaults to false.