diff options
| author | Guilhem Moulin <guilhem@fripost.org> | 2016-07-10 05:05:46 +0200 |
|---|---|---|
| committer | Guilhem Moulin <guilhem@fripost.org> | 2016-07-10 05:05:46 +0200 |
| commit | d6ff0c078e6d70e50c888e016a8a8b9b0d8d7782 (patch) | |
| tree | 03dc91145b2ccf5db868ca397e3029365fdbc50a /roles/MX | |
| parent | 37464e75e1863a89d757077400543dea7b9317ac (diff) | |
Postfix MX/MSA instances: put certs in the the instance's $config_directory.
Diffstat (limited to 'roles/MX')
| -rw-r--r-- | roles/MX/tasks/main.yml | 10 | ||||
| -rw-r--r-- | roles/MX/templates/etc/postfix/main.cf.j2 | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/roles/MX/tasks/main.yml b/roles/MX/tasks/main.yml index 1d08734..5f19d9f 100644 --- a/roles/MX/tasks/main.yml +++ b/roles/MX/tasks/main.yml @@ -76,6 +76,14 @@ owner=root group=root mode=0755 +- name: Create directory /etc/postfix/ssl + file: path=/etc/postfix-{{ postfix_instance[inst].name }}/ssl + state=directory + owner=root group=root + mode=0755 + tags: + - genkey + - meta: flush_handlers - name: Start Postfix @@ -86,7 +94,7 @@ become: False # `/usr/sbin/postmulti -i mx -x /usr/sbin/postconf -xh smtpd_tls_cert_file` fetch_cmd: cmd="openssl x509 -noout -pubkey" - stdin=/etc/postfix/ssl/mx.fripost.org.pem + stdin=/etc/postfix-{{ postfix_instance[inst].name }}/ssl/mx.fripost.org.pem dest=certs/public/mx{{ mxno | default('') }}.fripost.org.pub tags: - genkey diff --git a/roles/MX/templates/etc/postfix/main.cf.j2 b/roles/MX/templates/etc/postfix/main.cf.j2 index 0f7acae..a5caf46 100644 --- a/roles/MX/templates/etc/postfix/main.cf.j2 +++ b/roles/MX/templates/etc/postfix/main.cf.j2 @@ -91,8 +91,8 @@ smtp_tls_fingerprint_digest = sha256 smtpd_tls_security_level = may smtpd_tls_ciphers = medium smtpd_tls_protocols = !SSLv2, !SSLv3 -smtpd_tls_cert_file = /etc/postfix/ssl/mx.fripost.org.pem -smtpd_tls_key_file = /etc/postfix/ssl/mx.fripost.org.key +smtpd_tls_cert_file = $config_directory/ssl/mx.fripost.org.pem +smtpd_tls_key_file = $config_directory/ssl/mx.fripost.org.key smtpd_tls_dh1024_param_file = /etc/ssl/dhparams.pem smtpd_tls_CApath = /etc/ssl/certs/ smtpd_tls_session_cache_database= |