majic-ansible-roles Changeset

Changeset - 7d9696a7b5cc

Parent rev.

Child rev.

[Not reviewed]

0 7 0

Branko Majic (branko) - 4 years ago 2021-01-14 23:50:11
branko@majic.rs

MAR-151: Added support for Debian 10 Buster to mail_server role:

- Updated role reference documentaiton.
- Updated role meta information.
- Updated tests.
- Improve handling of configured IP in tests to avoid hard-coding the
value in the relevant test for Postfix configuration file content.

7 files changed with 99 insertions and 7 deletions:

docs/rolereference.rst

roles/mail_server/meta/main.yml

roles/mail_server/molecule/default/group_vars/parameters-optional.yml

roles/mail_server/molecule/default/host_vars/ldap-server.yml

roles/mail_server/molecule/default/molecule.yml

roles/mail_server/molecule/default/prepare.yml

roles/mail_server/molecule/default/tests/test_optional.py

0 comments (0 inline, 0 general) First comment

docs/rolereference.rst

➞

Show inline comments

@@ @@ -1239,6 +1239,7 @@ Distribution compatibility @@
 Role is compatible with the following distributions:
 - Debian 9 (Stretch)
 - Debian 10 (Buster)
 Examples

roles/mail_server/meta/main.yml

➞

Show inline comments

@@ @@ -16,5 +16,5 @@ galaxy_info: @@
   platforms:
     - name: Debian
       versions:
         - 8
         - 9
         - 10

roles/mail_server/molecule/default/group_vars/parameters-optional.yml

➞

Show inline comments

@@ @@ -28,9 +28,14 @@ smtp_rbl: @@
 mail_postmaster: "webmaster@parameters-optional"
 smtp_allow_relay_from:
-  - "10.31.127.22"
+  - "{{ release_based_smtp_allow_relay_from[ansible_distribution_release] }}"
 mail_message_size_limit: 20480001
 # Variables dependant on distribution release.
 release_based_smtp_allow_relay_from:
   stretch: "10.31.127.22"
   buster: "10.31.127.20"
 # common
 ca_certificates:
   testca: "{{ lookup('file', 'tests/data/x509/ca/level1.cert.pem') }}"

roles/mail_server/molecule/default/host_vars/ldap-server.yml

➞

Show inline comments

@@ @@ -43,10 +43,10 @@ backup_host_ssh_private_keys: @@
   ecdsa: "{{ lookup('file', 'tests/data/ssh/server_ecdsa') }}"
 backup_clients:
   - server: parameters-optional-j64
     ip: 10.31.127.31
     public_key: "{{ lookup('file', 'tests/data/ssh/parameters-optional.pub') }}"
   - server: parameters-optional-s64
     ip: 10.31.127.33
     public_key: "{{ lookup('file', 'tests/data/ssh/parameters-optional.pub') }}"
   - server: parameters-optional-b64
     ip: 10.31.127.31
     public_key: "{{ lookup('file', 'tests/data/ssh/parameters-optional.pub') }}"

roles/mail_server/molecule/default/molecule.yml

➞

Show inline comments

@@ @@ -80,6 +80,62 @@ platforms: @@
         network_name: private_network
         type: static
   - name: client1-buster
     groups:
       - client
       - client-relay-allowed
       - buster
       - smtp-server-requiring-tls
     box: debian/contrib-buster64
     memory: 256
     cpus: 1
     interfaces:
       - auto_config: true
         ip: 10.31.127.20
         network_name: private_network
         type: static
   - name: client2-buster
     groups:
       - client
       - client-relay-forbidden
       - buster
       - smtp-server-refusing-tls
     box: debian/contrib-buster64
     memory: 256
     cpus: 1
     interfaces:
       - auto_config: true
         ip: 10.31.127.21
         network_name: private_network
         type: static
   - name: parameters-mandatory-buster64
     groups:
       - parameters-mandatory
       - buster
     box: debian/contrib-buster64
     memory: 1536
     cpus: 1
     interfaces:
       - auto_config: true
         ip: 10.31.127.30
         network_name: private_network
         type: static
   - name: parameters-optional-buster64
     groups:
       - parameters-optional
       - buster
     box: debian/contrib-buster64
     memory: 1536
     cpus: 1
     interfaces:
       - auto_config: true
         ip: 10.31.127.31
         network_name: private_network
         type: static
 provisioner:
   name: ansible
   playbooks:

roles/mail_server/molecule/default/prepare.yml

➞

Show inline comments

@@ @@ -34,6 +34,14 @@ @@
           fqdn: parameters-optional-stretch64
         - name: parameters-optional-stretch64_smtp
           fqdn: parameters-optional-stretch64
         - name: parameters-mandatory-buster64_imap
           fqdn: parameters-mandatory-buster64
         - name: parameters-mandatory-buster64_smtp
           fqdn: parameters-mandatory-buster64
         - name: parameters-optional-buster64_imap
           fqdn: parameters-optional-buster64
         - name: parameters-optional-buster64_smtp
           fqdn: parameters-optional-buster64
     - name: Set-up link to generated X.509 material
       file:
@@ @@ -86,6 +94,26 @@ @@
 .31.127.32: "parameters-mandatory parameters-mandatory-stretch64"
 .31.127.33: "parameters-optional parameters-optional-stretch64"
 - hosts: buster
   become: true
   tasks:
     - name: Set-up the hosts file
       lineinfile:
         path: /etc/hosts
         regexp: "^{{ item.key }}"
         line: "{{ item.key }} {{ item.value }}"
         owner: root
         group: root
         mode: 0644
         state: present
       with_dict:
 .31.127.10: "ldap-server backup-server"
 .31.127.20: "client1 smtp-server-requiring-tls"
 .31.127.21: "client2 smtp-server-refusing-tls"
 .31.127.30: "parameters-mandatory parameters-mandatory-buster64"
 .31.127.31: "parameters-optional parameters-optional-buster64"
 - hosts: client
   become: true
   tasks:

roles/mail_server/molecule/default/tests/test_optional.py

➞

Show inline comments

@@ @@ -30,7 +30,9 @@ def test_postfix_main_cf_file_content(host): @@
     Tests if the Postfix main configuration file content is correct.
     """
     allow_relay_from_ip = "10.31.127.22"
     host_variables = host.ansible.get_variables()
     allow_relay_from_ip = host_variables["smtp_allow_relay_from"]
     hostname = host.run('hostname').stdout.strip()

0 comments (0 inline, 0 general) First comment