majic-ansible-roles Changeset

Changeset - 72c0eca9f1c7

Parent rev.

Child rev.

[Not reviewed]

0 5 0

Branko Majic (branko) - 5 months ago 2023-12-08 00:43:26
branko@majic.rs

MAR-189: Added support for Debian 11 Bullseye to mail_forwarder role.

5 files changed with 55 insertions and 3 deletions:

docs/rolereference.rst

roles/mail_forwarder/meta/main.yml

roles/mail_forwarder/molecule/default/molecule.yml

roles/mail_forwarder/molecule/default/prepare.yml

roles/mail_forwarder/templates/main.cf.j2

0 comments (0 inline, 0 general)

docs/rolereference.rst

➞

Show inline comments

@@ @@ -1394,6 +1394,7 @@ Distribution compatibility @@
 Role is compatible with the following distributions:
 - Debian 10 (Buster)
 - Debian 11 (Bullseye)
 Examples

roles/mail_forwarder/meta/main.yml

➞

Show inline comments

@@ @@ -12,3 +12,4 @@ galaxy_info: @@
     - name: Debian
       versions:
         - 10
         - 11

roles/mail_forwarder/molecule/default/molecule.yml

➞

Show inline comments

@@ @@ -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:

roles/mail_forwarder/molecule/default/prepare.yml

➞

Show inline comments

@@ @@ -69,6 +69,9 @@ @@
 .168.56.21: "parameters-mandatory-buster"
 .168.56.22: "parameters-optional-buster"
 .168.56.23: "parameters-no-incoming-buster"
 .168.56.31: "parameters-mandatory-bullseye"
 .168.56.32: "parameters-optional-bullseye"
 .168.56.33: "parameters-no-incoming-bullseye"
     - name: Install tools for testing
       apt:

roles/mail_forwarder/templates/main.cf.j2

➞

Show inline comments

@@ @@ -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

0 comments (0 inline, 0 general)