From 12e2e1882f77c6bdc27295988bdff1783dd1324d 2024-02-25 20:39:55
From: Branko Majic <branko@majic.rs>
Date: 2024-02-25 20:39:55
Subject: [PATCH] MAR-192: Added support for Debian 12 Bookworm to backup_client role:

- Drop the orphan config file for backup server helper.

---

diff --git a/docs/rolereference.rst b/docs/rolereference.rst
index 43fc796ab85d67f7af76a6c0673bf29866f7ec34..406e49498f6d4cab25a41d2500743da07357ac7e 100644
--- a/docs/rolereference.rst
+++ b/docs/rolereference.rst
@@ -2370,6 +2370,7 @@ Distribution compatibility
 Role is compatible with the following distributions:
 
 - Debian 11 (Bullseye)
+- Debian 12 (Bookworm)
 
 
 Examples
diff --git a/roles/backup_client/meta/main.yml b/roles/backup_client/meta/main.yml
index 3a4f09d122c149a92ea6d49d1f1ca1c773c05a4d..43a9d6c871383c949d7cca0cd9e828175cf674b5 100644
--- a/roles/backup_client/meta/main.yml
+++ b/roles/backup_client/meta/main.yml
@@ -9,3 +9,4 @@ galaxy_info:
     - name: Debian
       versions:
         - 11
+        - 12
diff --git a/roles/backup_client/molecule/default/molecule.yml b/roles/backup_client/molecule/default/molecule.yml
index c186bd1dd28958d9db67cc12e02472823548c66b..1020d5d1f9817726e97aa4145444cabe5f9b17b7 100644
--- a/roles/backup_client/molecule/default/molecule.yml
+++ b/roles/backup_client/molecule/default/molecule.yml
@@ -17,8 +17,9 @@ lint:
 # which will easily exceed the maximum username length of 32. Yay
 # stupid legacy design decisions!
 platforms:
+
   - name: backup-server
-    box: debian/bullseye64
+    box: debian/bookworm64
     memory: 512
     cpus: 1
     provider_raw_config_args:
@@ -57,6 +58,34 @@ platforms:
         network_name: private_network
         type: static
 
+  - name: param-mandatory-bookworm
+    groups:
+      - parameters-mandatory
+    box: debian/bookworm64
+    memory: 256
+    cpus: 1
+    provider_raw_config_args:
+      - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']"
+    interfaces:
+      - auto_config: true
+        ip: 192.168.56.20
+        network_name: private_network
+        type: static
+
+  - name: param-optional-bookworm
+    groups:
+      - parameters-optional
+    box: debian/bookworm64
+    memory: 256
+    cpus: 1
+    provider_raw_config_args:
+      - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']"
+    interfaces:
+      - auto_config: true
+        ip: 192.168.56.21
+        network_name: private_network
+        type: static
+
 provisioner:
   name: ansible
   config_options:
diff --git a/roles/backup_client/molecule/default/prepare.yml b/roles/backup_client/molecule/default/prepare.yml
index 51590dcd8b949bc0ae7cac593f6326e548e7c554..40993baeabd93c6902428a9b9f016279da6d9d88 100644
--- a/roles/backup_client/molecule/default/prepare.yml
+++ b/roles/backup_client/molecule/default/prepare.yml
@@ -120,5 +120,7 @@
     backup_users:
       - name: bak-param-mandatory-bullseye
         key: "{{ lookup('file', 'tests/data/ssh/parameters-mandatory.pub') }}"
+      - name: bak-param-mandatory-bookworm
+        key: "{{ lookup('file', 'tests/data/ssh/parameters-mandatory.pub') }}"
       - name: backupuser
         key: "{{ lookup('file', 'tests/data/ssh/parameters-optional.pub') }}"
diff --git a/roles/backup_client/molecule/default/tests/data/backup_server_custom-sshd_config b/roles/backup_client/molecule/default/tests/data/backup_server_custom-sshd_config
deleted file mode 100644
index d7a5dc5ae8cea87d160ce5db5f80f1389e4adf79..0000000000000000000000000000000000000000
--- a/roles/backup_client/molecule/default/tests/data/backup_server_custom-sshd_config
+++ /dev/null
@@ -1,2 +0,0 @@
-Match Group backup-users
-  ChrootDirectory %h