From 72c0eca9f1c72466b19f7dd062e0f8d7b5d3ffbd 2023-12-08 00:43:26
From: Branko Majic <branko@majic.rs>
Date: 2023-12-08 00:43:26
Subject: [PATCH] MAR-189: Added support for Debian 11 Bullseye to mail_forwarder role.

---

diff --git a/docs/rolereference.rst b/docs/rolereference.rst
index e048f2513b3841a33e21928a93e9954165d2cd23..48540715245848764804d1fa40643f3a1b5a192a 100644
--- a/docs/rolereference.rst
+++ b/docs/rolereference.rst
@@ -1394,6 +1394,7 @@ Distribution compatibility
 Role is compatible with the following distributions:
 
 - Debian 10 (Buster)
+- Debian 11 (Bullseye)
 
 
 Examples
diff --git a/roles/mail_forwarder/meta/main.yml b/roles/mail_forwarder/meta/main.yml
index 3a54553fc542deccd1a55cd03fdb893f84d841eb..51a0b88a39a5355914943024de095353f3deaf98 100644
--- a/roles/mail_forwarder/meta/main.yml
+++ b/roles/mail_forwarder/meta/main.yml
@@ -12,3 +12,4 @@ galaxy_info:
     - name: Debian
       versions:
         - 10
+        - 11
diff --git a/roles/mail_forwarder/molecule/default/molecule.yml b/roles/mail_forwarder/molecule/default/molecule.yml
index 03e15534c17c6e723ac0e3654cb8c2e1100c6ca2..3b6c6af0422bd6305da253dcd5510bf1ef5ccad1 100644
--- a/roles/mail_forwarder/molecule/default/molecule.yml
+++ b/roles/mail_forwarder/molecule/default/molecule.yml
@@ -14,11 +14,15 @@ lint:
 
 platforms:
 
+
+  # Helpers
+  # =======
+
   - name: mail-server
     groups:
       - mail-servers
       - helper
-    box: debian/contrib-buster64
+    box: debian/bullseye64
     memory: 256
     cpus: 1
     interfaces:
@@ -31,7 +35,7 @@ platforms:
     groups:
       - clients
       - helper
-    box: debian/contrib-buster64
+    box: debian/bullseye64
     memory: 256
     cpus: 1
     interfaces:
@@ -40,6 +44,10 @@ platforms:
         network_name: private_network
         type: static
 
+
+  # Buster
+  # ======
+
   - name: parameters-mandatory-buster
     groups:
       - parameters-mandatory
@@ -76,6 +84,46 @@ platforms:
         network_name: private_network
         type: static
 
+
+  # Bullseye
+  # ========
+
+  - name: parameters-mandatory-bullseye
+    groups:
+      - parameters-mandatory
+    box: debian/bullseye64
+    memory: 256
+    cpus: 1
+    interfaces:
+      - auto_config: true
+        ip: 192.168.56.31
+        network_name: private_network
+        type: static
+
+  - name: parameters-optional-bullseye
+    groups:
+      - parameters-optional
+    box: debian/bullseye64
+    memory: 256
+    cpus: 1
+    interfaces:
+      - auto_config: true
+        ip: 192.168.56.32
+        network_name: private_network
+        type: static
+
+  - name: parameters-no-incoming-bullseye
+    groups:
+      - parameters-no-incoming
+    box: debian/bullseye64
+    memory: 256
+    cpus: 1
+    interfaces:
+      - auto_config: true
+        ip: 192.168.56.33
+        network_name: private_network
+        type: static
+
 provisioner:
   name: ansible
   playbooks:
diff --git a/roles/mail_forwarder/molecule/default/prepare.yml b/roles/mail_forwarder/molecule/default/prepare.yml
index 4ec921e92400f6b847f8b689bc5f48817d7f9cee..45e4b7010f48a0e852c2d646b6300c598c100169 100644
--- a/roles/mail_forwarder/molecule/default/prepare.yml
+++ b/roles/mail_forwarder/molecule/default/prepare.yml
@@ -69,6 +69,9 @@
         192.168.56.21: "parameters-mandatory-buster"
         192.168.56.22: "parameters-optional-buster"
         192.168.56.23: "parameters-no-incoming-buster"
+        192.168.56.31: "parameters-mandatory-bullseye"
+        192.168.56.32: "parameters-optional-bullseye"
+        192.168.56.33: "parameters-no-incoming-bullseye"
 
     - name: Install tools for testing
       apt:
diff --git a/roles/mail_forwarder/templates/main.cf.j2 b/roles/mail_forwarder/templates/main.cf.j2
index e37f5ff3c05d4e939d1e4e3f3edc81ffe4b94afa..bb0295eeb99018bc53b36219a8fc33d4a4662b53 100644
--- a/roles/mail_forwarder/templates/main.cf.j2
+++ b/roles/mail_forwarder/templates/main.cf.j2
@@ -23,7 +23,6 @@ smtpd_tls_key_file=/etc/ssl/private/ssl-cert-snakeoil.key
 smtpd_tls_dh1024_param_file = /etc/ssl/private/{{ inventory_hostname }}_smtp.dh.pem
 smtpd_tls_dh512_param_file = /etc/ssl/private/{{ inventory_hostname }}_smtp.dh.pem
 smtpd_use_tls=yes
-smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache
 smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
 {% if smtp_relay_host %}
 smtp_tls_security_level=verify