From a75407a06513dba8f7c0b441c6808a26c0d38542 Mon Sep 17 00:00:00 2001 From: Adriel Sand Date: Mon, 18 Apr 2022 12:10:19 +0300 Subject: [PATCH] matrix-backup-borg: add unknown_unencrypted_repo_access_is_ok to config.yaml.j2 --- roles/matrix-backup-borg/templates/config.yaml.j2 | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/roles/matrix-backup-borg/templates/config.yaml.j2 b/roles/matrix-backup-borg/templates/config.yaml.j2 index c6d014742..210b7a65a 100644 --- a/roles/matrix-backup-borg/templates/config.yaml.j2 +++ b/roles/matrix-backup-borg/templates/config.yaml.j2 @@ -7,17 +7,11 @@ location: exclude_patterns: {{ matrix_backup_borg_location_exclude_patterns|to_json }} storage: -<<<<<<< HEAD - compression: {{ matrix_backup_borg_storage_compression }} - ssh_command: {{ matrix_backup_borg_storage_ssh_command }} - archive_name_format: '{{ matrix_backup_borg_storage_archive_name_format }}' - encryption_passphrase: {{ matrix_backup_borg_storage_encryption_passphrase }} -======= compression: {{ matrix_backup_borg_storage_compression|to_json }} ssh_command: {{ matrix_backup_borg_storage_ssh_command|to_json }} archive_name_format: {{ matrix_backup_borg_storage_archive_name_format|to_json }} encryption_passphrase: {{ matrix_backup_borg_storage_encryption_passphrase|to_json }} ->>>>>>> 5c1ee66e8dab15485b8bcb69e0a153012d6d40cf + unknown_unencrypted_repo_access_is_ok: {{ matrix_backup_borg_unknown_unencrypted_repo_access_is_ok|to_json }} retention: keep_hourly: {{ matrix_backup_borg_retention_keep_hourly|to_json }}