From 100b6a149d48df93f38807e0fa8758c0100af5cf Mon Sep 17 00:00:00 2001 From: Rene Date: Sat, 19 Nov 2022 14:03:44 +0100 Subject: [PATCH] changed fixed vars to definable ones --- host_vars/mail.universe.local.yml | 1 + roles/mailserver/tasks/configure_postfix.yml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/host_vars/mail.universe.local.yml b/host_vars/mail.universe.local.yml index 6ba3a0f..4d1000e 100644 --- a/host_vars/mail.universe.local.yml +++ b/host_vars/mail.universe.local.yml @@ -4,5 +4,6 @@ dovecot: true pigeonhole: true fetchmail: true mpop: true +npm_cert: "npm-29" mynetworks: '192.168.1.0/24, 127.0.0.0/8, 192.168.122.0/24, 10.20.20.0/28, 172.16.0.0/12, 192.168.3.0/24' \ No newline at end of file diff --git a/roles/mailserver/tasks/configure_postfix.yml b/roles/mailserver/tasks/configure_postfix.yml index 04d3e82..23f140d 100644 --- a/roles/mailserver/tasks/configure_postfix.yml +++ b/roles/mailserver/tasks/configure_postfix.yml @@ -19,7 +19,7 @@ - {key: "message_size_limit", value: "0"} - {key: "milter_default_action", value: "accept"} - {key: "mydestination", value: "'localhost, kashyyyk, coruscant'"} - - {key: "myhostname", value: "kashyyyk.universe.local"} + - {key: "myhostname", value: "{{ hostname | default(ansible_hostname) }}"} - {key: "mynetworks", value: "'{{ mynetworks }}'"} - {key: "mynetworks_style", value: "subnet"} - {key: "readme_directory", value: "no"} @@ -50,12 +50,12 @@ - {key: "smtpd_sasl_type", value: "dovecot"} - {key: "smtpd_sender_restrictions", value: "'hash:/etc/postfix/access, permit_mynetworks, reject_non_fqdn_sender, check_sender_access hash:/etc/postfix/sender_access'"} - {key: "smtpd_tls_auth_only", value: "yes"} - - {key: "smtpd_tls_cert_file", value: "/etc/letsencrypt/live/tantooine.myfirewall.org/fullchain.pem"} + - {key: "smtpd_tls_cert_file", value: "/etc/letsencrypt/live/{{ npm_cert }}/fullchain.pem"} - {key: "smtpd_tls_dh1024_param_file", value: "${config_directory}/dh2048.pem"} - {key: "smtpd_tls_dh512_param_file", value: "${config_directory}/dh512.pem"} - {key: "smtpd_tls_eecdh_grade", value: "strong"} - {key: "smtpd_tls_exclude_ciphers", value: "'aNULL,MD5,RC4,DES,IDEA,SEED,3DES'"} - - {key: "smtpd_tls_key_file", value: "/etc/letsencrypt/live/tantooine.myfirewall.org/privkey.pem"} + - {key: "smtpd_tls_key_file", value: "/etc/letsencrypt/live/{{ npm_cert }}/privkey.pem"} - {key: "smtpd_tls_loglevel", value: "1"} - {key: "smtpd_tls_mandatory_ciphers", value: "high"} - {key: "smtpd_tls_mandatory_exclude_ciphers", value: "'aNULL,MD5,RC4,IDEA,SEED,3DES'"}