From 991f49aa574a00b8ce562632e6400189514f4e11 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Tue, 28 Jun 2022 09:46:01 +0200 Subject: [PATCH] [backup-ft] Hello backup-ft! Signed-off-by: Yohann D'ANELLO --- group_vars/all/borg.yml | 5 ++++- host_vars/backup-ft.adm.crans.org.yml | 3 +++ host_vars/ft.adm.crans.org.yml | 6 ++++++ hosts | 2 ++ roles/borgbackup-server/templates/authorized_keys.j2 | 2 +- .../borgbackup-server/templates/update-motd.d/05-service.j2 | 2 +- 6 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 host_vars/backup-ft.adm.crans.org.yml create mode 100644 host_vars/ft.adm.crans.org.yml diff --git a/group_vars/all/borg.yml b/group_vars/all/borg.yml index e99c419d..abf2aa78 100644 --- a/group_vars/all/borg.yml +++ b/group_vars/all/borg.yml @@ -5,7 +5,9 @@ glob_borg: to_backup: - /etc - /var - path: /backup/borg + paths: + - /backup/borg-server + - /backup/borg-adh remote: - borg@backup-ft.adm.crans.org:/backup/borg-server/{{ ansible_hostname }} retention: @@ -17,4 +19,5 @@ glob_borg: - make-parent-dirs encryption_passphrase: "{{ vault.borg.encryption_passphrase }}" ssh_privkey: "{{ vault.borg.ssh.privkey }}" + ssh_pubkey: "{{ vault.borg.ssh.pubkey }}" ssh_options: "" diff --git a/host_vars/backup-ft.adm.crans.org.yml b/host_vars/backup-ft.adm.crans.org.yml new file mode 100644 index 00000000..dc2ef382 --- /dev/null +++ b/host_vars/backup-ft.adm.crans.org.yml @@ -0,0 +1,3 @@ +--- +interfaces: + adm: ens18 diff --git a/host_vars/ft.adm.crans.org.yml b/host_vars/ft.adm.crans.org.yml new file mode 100644 index 00000000..9bb00abd --- /dev/null +++ b/host_vars/ft.adm.crans.org.yml @@ -0,0 +1,6 @@ +--- +loc_borg: + to_backup: + - /etc + - /home_nounou + - /var diff --git a/hosts b/hosts index fb376282..b1e7e660 100644 --- a/hosts +++ b/hosts @@ -10,6 +10,7 @@ hodaur.adm.crans.org cameron.adm.crans.org [backups] +backup-ft.adm.crans.org [baie] cameron.adm.crans.org @@ -272,6 +273,7 @@ baie virtu [crans_vm] +backup-ft.adm.crans.org belenios.adm.crans.org boeing.adm.crans.org cas.adm.crans.org diff --git a/roles/borgbackup-server/templates/authorized_keys.j2 b/roles/borgbackup-server/templates/authorized_keys.j2 index 3504fcf9..80d0e785 100644 --- a/roles/borgbackup-server/templates/authorized_keys.j2 +++ b/roles/borgbackup-server/templates/authorized_keys.j2 @@ -1,3 +1,3 @@ {{ ansible_header | comment }} -command="borg serve --restrict-to-path {{ borg.path }}",restrict {{ vault.borgbackup_ssh_pubkey }} +command="borg serve{% for path in borg.paths %} --restrict-to-path {{ path }}{% endfor %}",restrict {{ borg.ssh_pubkey }} diff --git a/roles/borgbackup-server/templates/update-motd.d/05-service.j2 b/roles/borgbackup-server/templates/update-motd.d/05-service.j2 index f27119aa..b2f35c2f 100755 --- a/roles/borgbackup-server/templates/update-motd.d/05-service.j2 +++ b/roles/borgbackup-server/templates/update-motd.d/05-service.j2 @@ -1,3 +1,3 @@ #!/usr/bin/tail +14 {{ ansible_header | comment }} -> Borgbackup (Serveur) a été déployé sur cette machine. Les backups sont situés dans {{ borg.path }}. +> Borgbackup (Serveur) a été déployé sur cette machine. Les backups sont situés dans {{ borg.paths|join(', ') }}.