sendmail: Use cert and cert chain file seperately

For some reason sendmail didn't like fullchain file so seperate them.
This commit is contained in:
Timo Makinen 2021-03-11 17:28:21 +00:00
parent 4804a50b37
commit 5b03f74903
2 changed files with 18 additions and 3 deletions

View file

@ -34,18 +34,32 @@
- name: copy certificate - name: copy certificate
copy: copy:
src: "{{ item }}" src: "{{ item }}"
dest: "{{ tls_certs }}/{{ mail_server }}-fullchain.crt" dest: "{{ tls_certs }}/{{ mail_server }}.crt"
mode: 0644 mode: 0644
owner: root owner: root
group: "{{ ansible_wheel }}" group: "{{ ansible_wheel }}"
validate: /usr/bin/openssl x509 -in %s -noout validate: /usr/bin/openssl x509 -in %s -noout
with_first_found: with_first_found:
- "/srv/letsencrypt/live/{{ mail_server }}/fullchain.pem" - "/srv/letsencrypt/live/{{ mail_server }}/cert.pem"
- "/srv/ca/certs/{{ mail_server }}.crt" - "/srv/ca/certs/{{ mail_server }}.crt"
- "/srv/ca/certs/{{ inventory_hostname }}.crt" - "/srv/ca/certs/{{ inventory_hostname }}.crt"
tags: certificates tags: certificates
notify: restart sendmail notify: restart sendmail
- name: copy certificate chain
copy:
src: "{{ item }}"
dest: "{{ tls_certs }}/{{ mail_server }}-chain.crt"
mode: 0644
owner: root
group: "{{ ansible_wheel }}"
validate: /usr/bin/openssl x509 -in %s -noout
with_first_found:
- "/srv/letsencrypt/live/{{ mail_server }}/chain.pem"
- "/srv/ca/certs/ca.crt"
tags: certificates
notify: restart sendmail
- name: copy sendmail config template - name: copy sendmail config template
template: template:
src: sendmail.mc.j2 src: sendmail.mc.j2

View file

@ -23,7 +23,8 @@ TRUST_AUTH_MECH(`GSSAPI LOGIN PLAIN')dnl
define(`confAUTH_MECHANISMS', `EXTERNAL GSSAPI LOGIN PLAIN')dnl define(`confAUTH_MECHANISMS', `EXTERNAL GSSAPI LOGIN PLAIN')dnl
dnl # dnl #
define(`confCACERT_PATH', `/etc/mail/certs')dnl define(`confCACERT_PATH', `/etc/mail/certs')dnl
define(`confSERVER_CERT', `/etc/pki/tls/certs/{{ mail_server }}-fullchain.crt')dnl define(`confCACERT', `/etc/pki/tls/certs/{{ mail_server }}-chain.crt')dnl
define(`confSERVER_CERT', `/etc/pki/tls/certs/{{ mail_server }}.crt')dnl
define(`confSERVER_KEY', `/etc/pki/tls/private/{{ mail_server }}.key')dnl define(`confSERVER_KEY', `/etc/pki/tls/private/{{ mail_server }}.key')dnl
define(`confCLIENT_CERT', `/etc/pki/tls/certs/{{ mail_server }}.crt')dnl define(`confCLIENT_CERT', `/etc/pki/tls/certs/{{ mail_server }}.crt')dnl
define(`confCLIENT_KEY', `/etc/pki/tls/private/{{ mail_server }}.key')dnl define(`confCLIENT_KEY', `/etc/pki/tls/private/{{ mail_server }}.key')dnl