data.coop/ansible
8
3
Fork 7
Code Issues 49 Pull requests 9 Projects 1 Releases Wiki Activity

Merge pull request 'Rename variables to avoid name clash' (#204) from fix-restic-domain into main

Browse source 
Reviewed-on: #204
Reviewed-by: valberg <valberg@orn.li>
This commit is contained in:
reynir 2024-03-06 12:40:47 +00:00
parent 4112bb73b6 a0988aa05d
commit 00927a19df
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roles/docker/defaults/main.yml
View file

@ -44,8 +44,8 @@ services:
restic: restic:
volume_folder: "{{ volume_root_folder }}/restic" volume_folder: "{{ volume_root_folder }}/restic"
pre_deploy_tasks: true pre_deploy_tasks: true
user: dc-user remote_user: dc-user
domain: rynkeby.skovgaard.tel remote_domain: rynkeby.skovgaard.tel
host_key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBLGol2G+a87ssy0nu/STKBZSiGyhZhZKx/ujfe9IeFo host_key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBLGol2G+a87ssy0nu/STKBZSiGyhZhZKx/ujfe9IeFo
repository: restic repository: restic
version: "1.7.0" version: "1.7.0"

4
roles/docker/templates/compose-files/restic.yml.j2
View file

@ -8,7 +8,7 @@ services:
environment: environment:
RUN_ON_STARTUP: false RUN_ON_STARTUP: false
BACKUP_CRON: "0 30 3 * * *" 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_PASSWORD: "{{ restic_secrets.repository_password }}"
RESTIC_BACKUP_SOURCES: /mnt/volumes RESTIC_BACKUP_SOURCES: /mnt/volumes
RESTIC_BACKUP_ARGS: >- RESTIC_BACKUP_ARGS: >-
@ -37,7 +37,7 @@ services:
environment: environment:
RUN_ON_STARTUP: false RUN_ON_STARTUP: false
PRUNE_CRON: "0 30 4 * * *" 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 }}" RESTIC_PASSWORD: "{{ restic_secrets.repository_password }}"
TZ: Europe/copenhagen TZ: Europe/copenhagen
volumes: volumes:

2
roles/docker/templates/restic/ssh.config.j2
View file

@ -1,3 +1,3 @@
Host {{ services.restic.domain }} Host {{ services.restic.remote_domain }}
ServerAliveInterval 60 ServerAliveInterval 60
ServerAliveCountMax 240 ServerAliveCountMax 240