From f8926d640a30e31b2fbd12df56e3bb624024876d 2024-08-30 14:42:47
From: Branko Majic <branko@majic.rs>
Date: 2024-08-30 14:42:47
Subject: [PATCH] MAR-239: Dropped support for Debian 11 Bullseye from the mail_forwarder role.

---

diff --git a/roles/mail_forwarder/molecule/default/molecule.yml b/roles/mail_forwarder/molecule/default/molecule.yml
index 64bdf9e47ab270ec89ec751b53d33b83609b23e0..c0deb994944ed919c6cf873880f985b68c6db2ea 100644
--- a/roles/mail_forwarder/molecule/default/molecule.yml
+++ b/roles/mail_forwarder/molecule/default/molecule.yml
@@ -22,7 +22,7 @@ platforms:
     groups:
       - mail-servers
       - helper
-    box: debian/bullseye64
+    box: debian/bookworm64
     memory: 256
     cpus: 1
     provider_raw_config_args:
@@ -37,7 +37,7 @@ platforms:
     groups:
       - clients
       - helper
-    box: debian/bullseye64
+    box: debian/bookworm64
     memory: 256
     cpus: 1
     provider_raw_config_args:
@@ -49,52 +49,6 @@ platforms:
         type: static
 
 
-  # Bullseye
-  # ========
-
-  - name: parameters-mandatory-bullseye
-    groups:
-      - parameters-mandatory
-    box: debian/bullseye64
-    memory: 256
-    cpus: 1
-    provider_raw_config_args:
-      - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']"
-    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
-    provider_raw_config_args:
-      - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']"
-    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
-    provider_raw_config_args:
-      - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']"
-    interfaces:
-      - auto_config: true
-        ip: 192.168.56.33
-        network_name: private_network
-        type: static
-
-
   # Bookworm
   # ========
 
diff --git a/roles/mail_forwarder/molecule/default/prepare.yml b/roles/mail_forwarder/molecule/default/prepare.yml
index e7ac23d688a3d20fc3b9e5ddb7ceb86027eb1594..9ed70c614048a8fd9ee502f314f38b31e39ed8f6 100644
--- a/roles/mail_forwarder/molecule/default/prepare.yml
+++ b/roles/mail_forwarder/molecule/default/prepare.yml
@@ -66,9 +66,6 @@
       with_dict:
         192.168.56.11: "mail-server domain1"
         192.168.56.12: "client1"
-        192.168.56.31: "parameters-mandatory-bullseye"
-        192.168.56.32: "parameters-optional-bullseye"
-        192.168.56.33: "parameters-no-incoming-bullseye"
         192.168.56.21: "parameters-mandatory-bookworm"
         192.168.56.22: "parameters-optional-bookworm"
         192.168.56.23: "parameters-no-incoming-bookworm"
diff --git a/roles/mail_forwarder/templates/main.cf.j2 b/roles/mail_forwarder/templates/main.cf.j2
index b27e2eb09cd8667f0adffce97fe025bb2c328ac0..2be6f5126970be79ed07e624897a0958d02d4bea 100644
--- a/roles/mail_forwarder/templates/main.cf.j2
+++ b/roles/mail_forwarder/templates/main.cf.j2
@@ -32,11 +32,9 @@ message_size_limit = {{ mail_message_size_limit }}
 # Disable output of Postfix README file paths when invoking postconf.
 readme_directory = no
 
-{% if ansible_distribution_release != 'bullseye' %}
 # Use whitelist/blacklist instead of allowlist/denylist in log
 # entries.
 respectful_logging = no
-{% endif %}
 
 # Compatibility level for default values. For more details, see:
 #     https://www.postfix.org/COMPATIBILITY_README.html