From f5cdd6b40727df7a8859ea59667dcd62d9a46cde Mon Sep 17 00:00:00 2001
From: Lzebulon <lzebulon@crans.org>
Date: Tue, 13 Jan 2026 11:59:19 +0100
Subject: [PATCH] update: new version borgmatic, remove section
 location,retention,storage

---
 .../templates/borgmatic/config.yaml.j2        | 77 +++++++++----------
 1 file changed, 38 insertions(+), 39 deletions(-)

diff --git a/roles/borgbackup-client/templates/borgmatic/config.yaml.j2 b/roles/borgbackup-client/templates/borgmatic/config.yaml.j2
index 03900d78..d74f43cf 100644
--- a/roles/borgbackup-client/templates/borgmatic/config.yaml.j2
+++ b/roles/borgbackup-client/templates/borgmatic/config.yaml.j2
@@ -1,75 +1,74 @@
 {{ ansible_header | comment }}
 
-location:
-    source_directories:
+#location
+source_directories:
 {% for dir in borg.to_backup %}
-        - {{ dir }}
+    - {{ dir }}
 {% endfor %}
 
-    repositories:
+repositories:
 {% for remote in borg.remote %}
-        - {{ remote }}
+    - path {{ remote }}
 {% endfor %}
 
-    exclude_patterns:
-        - '*.pyc'
-        - '\#*\#'
-        - '*~'
+exclude_patterns:
+    - '*.pyc'
+    - '\#*\#'
+    - '*~'
 {% for pattern in borg.to_exclude | default([]) %}
-        - {{ pattern }}
+    - {{ pattern }}
 {% endfor %}
 
-    exclude_caches: true
+exclude_caches: true
 
-    exclude_if_present:
-        - .nobackup
+exclude_if_present:
+    - .nobackup
 
-    borgmatic_source_directory: /tmp/borgmatic
+user_runtime_directory: /tmp/borgmatic
 
-storage:
-    relocated_repo_access_is_ok: true
-    encryption_passphrase: {{ borg.encryption_passphrase }}
-    ssh_command: ssh -i /etc/borgmatic/id_ed25519_borg {{ borg.ssh_options | default("") }}
-    borg_base_directory: /etc/borgmatic
-    borg_config_directory: /etc/borgmatic/config/
-    borg_cache_directory: /etc/borgmatic/cache
-    borg_security_directory: /etc/borgmatic/config/security
-    borg_keys_directory: /etc/borgmatic/config/keys
-    compression: 'lz4'
-    umask: 0077
-    lock_wait: 5
-    archive_name_format: '{hostname}-{now}'
+#storage
+relocated_repo_access_is_ok: true
+encryption_passphrase: {{ borg.encryption_passphrase }}
+ssh_command: ssh -i /etc/borgmatic/id_ed25519_borg {{ borg.ssh_options | default("") }}
+borg_base_directory: /etc/borgmatic
+borg_config_directory: /etc/borgmatic/config/
+borg_cache_directory: /etc/borgmatic/cache
+borg_security_directory: /etc/borgmatic/config/security
+borg_keys_directory: /etc/borgmatic/config/keys
+compression: 'lz4'
+umask: 0077
+lock_wait: 5
+archive_name_format: '{hostname}-{now}'
 {% set extra_init = borg.extra_init | default([]) %}
 {% set extra_prune = borg.extra_prune | default([]) %}
 {% set extra_create = borg.extra_create | default([]) %}
 {% set extra_check = borg.extra_check | default([]) %}
 {% if extra_init or extra_prune or extra_create or extra_check %}
-    extra_borg_options:
+extra_borg_options:
 {% endif %}
 {% if extra_init %}
-        # Extra command-line options to pass to "borg init".
-        init: {% for cmd in extra_init %}--{{ cmd }} {% endfor %}
+    # Extra command-line options to pass to "borg init".
+    init: {% for cmd in extra_init %}--{{ cmd }} {% endfor %}
 {% endif %}
 {% if extra_prune  %}
-        # Extra command-line options to pass to "borg prune".
-        prune: {% for cmd in extra_prune  %}--{{ cmd }} {% endfor %}
+    # Extra command-line options to pass to "borg prune".
+    prune: {% for cmd in extra_prune  %}--{{ cmd }} {% endfor %}
 {% endif %}
 
 {% if extra_create %}
-        # Extra command-line options to pass to "borg create".
-        create: {% for cmd in extra_create %}--{{ cmd }} {% endfor %}
+    # Extra command-line options to pass to "borg create".
+    create: {% for cmd in extra_create %}--{{ cmd }} {% endfor %}
 {% endif %}
 
 {% if extra_check %}
-        # Extra command-line options to pass to "borg check".
-        check: {% for cmd in extra_check %}--{{ cmd }} {% endfor %}
+    # Extra command-line options to pass to "borg check".
+    check: {% for cmd in extra_check %}--{{ cmd }} {% endfor %}
 {% endif %}
 
-retention:
+#retention
 {% for retention in borg.retention %}
-    keep_{{ retention[0] }}: {{ retention[1] }}
+keep_{{ retention[0] }}: {{ retention[1] }}
 {% endfor %}
-    prefix: '{hostname}-'
 
 skip_actions:
 {% for action in borg.skip_actions %}