majic-ansible-roles Changeset

Changeset - a22f3d46ff21

Parent rev.

Child rev.

[Not reviewed]

0 5 0

Branko Majic (branko) - 2 months ago 2025-02-02 19:09:02
branko@majic.rs

MAR-243: Fixed incorrect usage of inventory naming in mail_server role.

5 files changed with 18 insertions and 13 deletions:

docs/releasenotes.rst

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

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

roles/mail_server/tasks/main.yml

roles/mail_server/templates/main.cf.j2

0 comments (0 inline, 0 general) First comment

docs/releasenotes.rst

➞

Show inline comments

@@ @@ -76,6 +76,11 @@ Upgraded to Ansible 10.4.x. Dropped support for Debian 11 @@
     requirements upgrade checks virtual environment that can happen if
     the initial virtual environment set-up fails.
 * ``mail_server`` role
   * Fixed incorrect use of inventory name instead of FQDN and hostname
     for deployed files and configuration files.
 .0.0
 -----

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

➞

Show inline comments

 mail_ldap_postfix_password: postfixpassword
 mail_ldap_dovecot_password: dovecotpassword
 imap_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_imap.cert.pem') }}"
 imap_tls_key: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_imap.key.pem') }}"
 imap_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/{{ ansible_fqdn }}_imap.cert.pem') }}"
 imap_tls_key: "{{ lookup('file', 'tests/data/x509/server/{{ ansible_fqdn }}_imap.key.pem') }}"
 smtp_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_smtp.cert.pem') }}"
 smtp_tls_key: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_smtp.key.pem') }}"
 smtp_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/{{ ansible_fqdn }}_smtp.cert.pem') }}"
 smtp_tls_key: "{{ lookup('file', 'tests/data/x509/server/{{ ansible_fqdn }}_smtp.key.pem') }}"
 # common
 ca_certificates:

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

➞

Show inline comments

@@ @@ -19,12 +19,12 @@ mail_user: virtmail @@
 mail_user_uid: 5000
 mail_user_gid: 5000
 imap_max_user_connections_per_ip: 2
 imap_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_imap.cert.pem') }}"
 imap_tls_key: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_imap.key.pem') }}"
 imap_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/{{ ansible_fqdn }}_imap.cert.pem') }}"
 imap_tls_key: "{{ lookup('file', 'tests/data/x509/server/{{ ansible_fqdn }}_imap.key.pem') }}"
 local_mail_aliases:
   root: "john.doe@domain1"
 smtp_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_smtp.cert.pem') }}"
 smtp_tls_key: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_smtp.key.pem') }}"
 smtp_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/{{ ansible_fqdn }}_smtp.cert.pem') }}"
 smtp_tls_key: "{{ lookup('file', 'tests/data/x509/server/{{ ansible_fqdn }}_smtp.key.pem') }}"
 imap_folder_separator: "."
 smtp_rbl:
   - bl.spamcop.net

roles/mail_server/tasks/main.yml

➞

Show inline comments

@@ @@ -171,7 +171,7 @@ @@
 - name: Configure visible mail name of the system
   ansible.builtin.copy:
-    content: "{{ inventory_hostname }}"
+    content: "{{ ansible_fqdn }}"
     dest: "/etc/mailname"
     owner: root
     group: root

roles/mail_server/templates/main.cf.j2

➞

Show inline comments

@@ @@ -6,7 +6,7 @@ @@
 # ================
 # Internet hostname of this mail system.
-myhostname = {{ inventory_hostname }}
+myhostname = {{ ansible_fqdn }}
 # Under Debian, when a file name is specified, the first line of the
 # file be used as the SMTP server name.
@@ @@ -49,7 +49,7 @@ compatibility_level = 3.6 @@
 # ======================
 # List of domains for local transport deliveries.
-mydestination = {{ inventory_hostname }}, {{ inventory_hostname_short }}, localhost.localdomain, localhost
+mydestination = {{ ansible_fqdn }}, {{ ansible_hostname }}, localhost.localdomain, localhost
 # Alias maps for local deliveries (to system accounts).
 alias_maps = hash:/etc/aliases
 smtpd_tls_key_file = /etc/ssl/private/{{ ansible_fqdn }}_smtp.key
 # Use custom, generated DH parameters for increased security.
 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_tls_dh1024_param_file = /etc/ssl/private/{{ ansible_fqdn }}_smtp.dh.pem
 smtpd_tls_dh512_param_file = /etc/ssl/private/{{ ansible_fqdn }}_smtp.dh.pem
 # Use TLS when available with Postfix SMTP client.
 smtp_tls_security_level = may

0 comments (0 inline, 0 general) First comment