From 189885c7da802d44077a1a6e7b9cf864941b72d5 Mon Sep 17 00:00:00 2001
From: Maxime Bombar <bombar@crans.org>
Date: Fri, 1 Jan 2021 19:22:46 +0100
Subject: [PATCH 1/3] [borgbackup-client] don't use ansible_lsb

---
 roles/borgbackup-client/tasks/main.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/roles/borgbackup-client/tasks/main.yml b/roles/borgbackup-client/tasks/main.yml
index 2325ea27..3bdd417a 100644
--- a/roles/borgbackup-client/tasks/main.yml
+++ b/roles/borgbackup-client/tasks/main.yml
@@ -6,7 +6,10 @@
   loop:
     - sources.list.d/bullseye.list
     - preferences.d/borgmatic-bullseye
-  when: ansible_lsb.release | int <= 10
+  when:
+    - ansible_distribution == "Debian"
+    - ansible_distribution_major_version | int <= 10
+    - ansible_distribution_release != "bullseye"
 
 - name: Install borgbackup
   apt:
@@ -25,7 +28,7 @@
     state: directory
     mode: 0700
     owner: root
-  
+
 - name: Deploy ssh private key
   template:
     src: "borgmatic/id_ed25519_borg.j2"

From 8f65faa63868fd2edab25f77a282f3c82dc829ec Mon Sep 17 00:00:00 2001
From: Maxime Bombar <bombar@crans.org>
Date: Fri, 1 Jan 2021 18:38:10 +0100
Subject: [PATCH 2/3] [borgbackup-server] Render unto borg the things that are
 borg's

---
 roles/borgbackup-server/tasks/main.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/roles/borgbackup-server/tasks/main.yml b/roles/borgbackup-server/tasks/main.yml
index 052347d5..fc501928 100644
--- a/roles/borgbackup-server/tasks/main.yml
+++ b/roles/borgbackup-server/tasks/main.yml
@@ -30,6 +30,7 @@
     src: "authorized_keys.j2"
     dest: "/var/lib/borg/.ssh/authorized_keys"
     mode: 0600
+    owner: borg
 
 - name: Indicate role in motd
   template:

From 73440ec9afba6ae594187354df50393715e9a84b Mon Sep 17 00:00:00 2001
From: Maxime Bombar <bombar@crans.org>
Date: Fri, 1 Jan 2021 19:08:29 +0100
Subject: [PATCH 3/3] Split backup playbook into client and server

---
 plays/backup.yml             | 14 ++------------
 plays/borgbackups_client.yml | 15 +++++++++++++++
 plays/borgbackups_server.yml | 15 +++++++++++++++
 plays/root.yml               |  8 +-------
 4 files changed, 33 insertions(+), 19 deletions(-)
 create mode 100755 plays/borgbackups_client.yml
 create mode 100755 plays/borgbackups_server.yml

diff --git a/plays/backup.yml b/plays/backup.yml
index 1949a5ca..25272c4c 100755
--- a/plays/backup.yml
+++ b/plays/backup.yml
@@ -1,15 +1,5 @@
 #!/usr/bin/env ansible-playbook
 ---
 
-- hosts: server
-  vars:
-    borg: '{{ glob_borg | default({}) | combine(loc_borg | default({})) }}'
-    mirror: '{{ glob_mirror | default({}) | combine(loc_mirror | default({})) }}'
-  roles:
-    - borgbackup-client
-
-- hosts: backups
-  vars:
-    borg: '{{ glob_borg | default({}) | combine(loc_borg | default({})) }}'
-  roles:
-    - borgbackup-server
+- import_playbook: borgbackup_client.yml
+- import_playbook: borgbackup_server.yml
diff --git a/plays/borgbackups_client.yml b/plays/borgbackups_client.yml
new file mode 100755
index 00000000..1949a5ca
--- /dev/null
+++ b/plays/borgbackups_client.yml
@@ -0,0 +1,15 @@
+#!/usr/bin/env ansible-playbook
+---
+
+- hosts: server
+  vars:
+    borg: '{{ glob_borg | default({}) | combine(loc_borg | default({})) }}'
+    mirror: '{{ glob_mirror | default({}) | combine(loc_mirror | default({})) }}'
+  roles:
+    - borgbackup-client
+
+- hosts: backups
+  vars:
+    borg: '{{ glob_borg | default({}) | combine(loc_borg | default({})) }}'
+  roles:
+    - borgbackup-server
diff --git a/plays/borgbackups_server.yml b/plays/borgbackups_server.yml
new file mode 100755
index 00000000..1949a5ca
--- /dev/null
+++ b/plays/borgbackups_server.yml
@@ -0,0 +1,15 @@
+#!/usr/bin/env ansible-playbook
+---
+
+- hosts: server
+  vars:
+    borg: '{{ glob_borg | default({}) | combine(loc_borg | default({})) }}'
+    mirror: '{{ glob_mirror | default({}) | combine(loc_mirror | default({})) }}'
+  roles:
+    - borgbackup-client
+
+- hosts: backups
+  vars:
+    borg: '{{ glob_borg | default({}) | combine(loc_borg | default({})) }}'
+  roles:
+    - borgbackup-server
diff --git a/plays/root.yml b/plays/root.yml
index 8c5c376c..e4bb12ae 100755
--- a/plays/root.yml
+++ b/plays/root.yml
@@ -84,11 +84,5 @@
       retries: 3
       until: apt_result is succeeded
 
-- hosts: server
-  vars:
-    borg: '{{ glob_borg | default({}) | combine(loc_borg | default({})) }}'
-    mirror: '{{ glob_mirror | default({}) | combine(loc_mirror | default({})) }}'
-  roles:
-    - borgbackup-client
-
+- import_playbook: borgbackup_client.yml
 - import_playbook: monitoring.yml