From e878b0ee83cce87a121e163252a2c4d79dd7a572 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Tue, 20 Oct 2020 10:53:42 +1100 Subject: [PATCH] borg-backup: use unique mark in .ssh/config This writes out the ssh config so the backup process uses the right key/user. Since we have a transition period where we have bup and borg backups we need to make the borg config have unique markers, or the two fight over the configuration block. Change-Id: I5455da3f2829e2aa8e0c531193adbbeff4b4776d --- playbooks/roles/borg-backup/tasks/main.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/playbooks/roles/borg-backup/tasks/main.yaml b/playbooks/roles/borg-backup/tasks/main.yaml index 8578cc8dc0..ac452fb900 100644 --- a/playbooks/roles/borg-backup/tasks/main.yaml +++ b/playbooks/roles/borg-backup/tasks/main.yaml @@ -33,6 +33,7 @@ IdentityFile /root/.ssh/id_borg_backup_ed25519 User {{ borg_username }} mode: 0600 + marker: '# {mark} ANSIBLE MANAGED BLOCK borg-backup' with_inventory_hostnames: borg-backup-server - name: Generate borg_user info tuple