From a0988aa05de376e379cc18174f3679f06754f54e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reynir=20Bj=C3=B6rnsson?= Date: Wed, 6 Mar 2024 13:38:46 +0100 Subject: [PATCH] Rename variables to avoid name clash --- roles/docker/defaults/main.yml | 4 ++-- roles/docker/templates/compose-files/restic.yml.j2 | 4 ++-- roles/docker/templates/restic/ssh.config.j2 | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index a16ca25..c34b43b 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -44,8 +44,8 @@ services: restic: volume_folder: "{{ volume_root_folder }}/restic" pre_deploy_tasks: true - user: dc-user - domain: rynkeby.skovgaard.tel + remote_user: dc-user + remote_domain: rynkeby.skovgaard.tel host_key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBLGol2G+a87ssy0nu/STKBZSiGyhZhZKx/ujfe9IeFo repository: restic version: "1.7.0" diff --git a/roles/docker/templates/compose-files/restic.yml.j2 b/roles/docker/templates/compose-files/restic.yml.j2 index 13dd9a7..89027a3 100644 --- a/roles/docker/templates/compose-files/restic.yml.j2 +++ b/roles/docker/templates/compose-files/restic.yml.j2 @@ -8,7 +8,7 @@ services: environment: RUN_ON_STARTUP: false BACKUP_CRON: "0 30 3 * * *" - RESTIC_REPOSITORY: sftp:{{ services.restic.user }}@{{ services.restic.domain }}:{{ services.restic.repository }} + RESTIC_REPOSITORY: sftp:{{ services.restic.remote_user }}@{{ services.restic.remote_domain }}:{{ services.restic.repository }} RESTIC_PASSWORD: "{{ restic_secrets.repository_password }}" RESTIC_BACKUP_SOURCES: /mnt/volumes RESTIC_BACKUP_ARGS: >- @@ -37,7 +37,7 @@ services: environment: RUN_ON_STARTUP: false PRUNE_CRON: "0 30 4 * * *" - RESTIC_REPOSITORY: sftp:{{ services.restic.user }}@{{ services.restic.domain }}:{{ services.restic.repository }} + RESTIC_REPOSITORY: sftp:{{ services.restic.remote_user }}@{{ services.restic.remote_domain }}:{{ services.restic.repository }} RESTIC_PASSWORD: "{{ restic_secrets.repository_password }}" TZ: Europe/copenhagen volumes: diff --git a/roles/docker/templates/restic/ssh.config.j2 b/roles/docker/templates/restic/ssh.config.j2 index 1b6b024..98aa337 100644 --- a/roles/docker/templates/restic/ssh.config.j2 +++ b/roles/docker/templates/restic/ssh.config.j2 @@ -1,3 +1,3 @@ -Host {{ services.restic.domain }} +Host {{ services.restic.remote_domain }} ServerAliveInterval 60 ServerAliveCountMax 240