From cf59e969425933e1f9ca2d69246a66c4cad43dd7 Mon Sep 17 00:00:00 2001
From: "pulsar89.5" <pulsar@ykn.fr>
Date: Fri, 28 Jul 2023 09:03:59 +0200
Subject: [PATCH] [EVO] Utiliser la nouvelle syntaxe

---
 README.md                |  2 +-
 defaults/main.yml        |  8 ++++++++
 templates/config.yaml.j2 | 21 +++++++++++----------
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 53f7d63..1c5afbe 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ Liste des éléments exclus de la sauvegarde.
 
 ### borgmatic_repositories
 
-Liste des dépôts Borg sur lesquels envoyer la sauvegarde.
+Dictionnaire contenant le `label` et le `path` des dépôts vers lesquels envoyer la sauvegarde.
 
 *<span style="text-decoration: underline">Valeur par défaut:</span> aucune*
 
diff --git a/defaults/main.yml b/defaults/main.yml
index 1dcea10..e1f5a8f 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -12,14 +12,22 @@ borgmatic_checks:
     frequency: 4 weeks
   - name: extract
     frequency: 2 weeks
+
 borgmatic_healthchecks: ""
 borgmatic_exclude_patterns: []
+
 borgmatic_repositories: []
+# Exemple:
+#  - label: default
+#    path: ssh://user@backupserver/./sourcehostname.borg
+
 borgmatic_source_directories: []
+
 borgmatic_retention:
   daily: 7
   monthly: 0
   weekly: 4
+
 borgmatic_name: "{{ inventory_hostname }}_{now}"
 borgmatic_compression: none
 borgmatic_passphrase: ""
diff --git a/templates/config.yaml.j2 b/templates/config.yaml.j2
index 7646025..92b5e90 100644
--- a/templates/config.yaml.j2
+++ b/templates/config.yaml.j2
@@ -1,5 +1,16 @@
 ---
 
+exclude_patterns: {{ borgmatic_exclude_patterns }}
+source_directories: {{ borgmatic_source_directories }}
+
+archive_name_format: {{ borgmatic_name }}
+compression: {{ borgmatic_compression }}
+encryption_passphrase: {{ borgmatic_passphrase }}
+
+repositories: {{ borgmatic_repositories }}
+  - label: {{ borgmatic_repositories.label }}
+    path: {{ borgmatic_repositories.path }}
+
 consistency:
   checks: {{ borgmatic_checks }}
 
@@ -8,17 +19,7 @@ hooks:
     ping_url: {{ borgmatic_healthchecks }}
     send_logs: false
 
-location:
-  exclude_patterns: {{ borgmatic_exclude_patterns }}
-  repositories: {{ borgmatic_repositories }}
-  source_directories: {{ borgmatic_source_directories }}
-
 retention:
   keep_daily: {{ borgmatic_retention.daily }}
   keep_monthly: {{ borgmatic_retention.monthly }}
   keep_weekly: {{ borgmatic_retention.weekly }}
-
-storage:
-  archive_name_format: {{ borgmatic_name }}
-  compression: {{ borgmatic_compression }}
-  encryption_passphrase: {{ borgmatic_passphrase }}