Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,21 +114,29 @@ That's where I'm mostly fuzzy, but that's how it works for us:

```yml
postfix_smtp:
tls_CApath: '/etc/pki/tls/certs'
tls_security_level: 'may'
tls_cert_file: '/etc/pki/cert.pem'
tls_key_file: '/etc/pki/key.pem'
tls_note_starttls_offer: 'yes'
sasl:
security_options:
- noplaintext
- noanonymous
password_maps:
- 'hash:/etc/postfix/sasl_password'
tls:
- CApath: '/etc/pki/tls/certs'
- security_level: 'may'
- cert_file: '/etc/pki/cert.pem'
- key_file: '/etc/pki/key.pem'
- note_starttls_offer: 'yes'

postfix_smtpd:
tls_CApath: '/etc/pki/tls/certs'
tls_security_level: 'may'
tls_cert_file: '/etc/pki/cert.pem'
tls_key_file: '/etc/pki/key.pem'
tls_auth_only: 'no'
tls_loglevel: '1'
tls_received_header: 'yes'
tls_session_cache_timeout: '3600s'
tls:
- CApath: '/etc/pki/tls/certs'
- security_level: 'may'
- cert_file: '/etc/pki/cert.pem'
- key_file: '/etc/pki/key.pem'
- auth_only: 'no'
- loglevel: '1'
- received_header: 'yes'
- session_cache_timeout: '3600s'

postfix_tls_random_source: 'dev:/dev/urandom'
```
Expand Down
62 changes: 36 additions & 26 deletions templates/redhat-6-main.cf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -705,46 +705,56 @@ readme_directory = /usr/share/doc/postfix-2.6.6/README_FILES
smtp_generic_maps = {{ postfix_smtp_generic_maps }}
{% endif %}
{% if postfix_smtp is defined %}
{% if postfix_smtp.tls_note_starttls_offer is defined %}
smtp_tls_note_starttls_offer = {{ postfix_smtp.tls_note_starttls_offer }}
{% if postfix_smtp.sasl is defined %}
{% if postfix_smtp.sasl.security_options is defined %}
smtp_sasl_security_options = {{ postfix_smtp.sasl.security_options | join(', ') }}
{% endif %}
{% if postfix_smtp.tls_CApath is defined %}
smtp_tls_CApath = {{ postfix_smtp.tls_CApath }}
{% if postfix_smtp.sasl.password_maps is defined %}
smtp_sasl_password_maps = {{ postfix_smtp.sasl.password_maps | join(', ') }}
{% endif %}
{% if postfix_smtp.tls_security_level is defined %}
smtp_tls_security_level = {{ postfix_smtp.tls_security_level }}
{% endif %}
{% if postfix_smtp.tls_cert_file is defined %}
smtp_tls_cert_file = {{ postfix_smtp.tls_cert_file }}
{% if postfix_smtp.tls is defined %}
{% if postfix_smtp.tls.note_starttls_offer is defined %}
smtp_tls_note_starttls_offer = {{ postfix_smtp.tls.note_starttls_offer }}
{% endif %}
{% if postfix_smtp.tls_key_file is defined %}
smtp_tls_key_file = {{ postfix_smtp.tls_key_file }}
{% if postfix_smtp.tls.CApath is defined %}
smtp_tls_CApath = {{ postfix_smtp.tls.CApath }}
{% endif %}
{% if postfix_smtp.tls.security_level is defined %}
smtp_tls_security_level = {{ postfix_smtp.tls.security_level }}
{% endif %}
{% if postfix_smtp.tls.cert_file is defined %}
smtp_tls_cert_file = {{ postfix_smtp.tls.cert_file }}
{% endif %}
{% if postfix_smtp.tls.key_file is defined %}
smtp_tls_key_file = {{ postfix_smtp.tls.key_file }}
{% endif %}
{% endif %}
{% if postfix_smtpd is defined %}
{% if postfix_smtpd.tls_CApath is defined %}
smtpd_tls_CApath = {{ postfix_smtpd.tls_CApath }}
{% if postfix_smtpd.tls.CApath is defined %}
smtpd_tls_CApath = {{ postfix_smtpd.tls.CApath }}
{% endif %}
{% if postfix_smtpd.tls.security_level is defined %}
smtpd_tls_security_level = {{ postfix_smtpd.tls.security_level }}
{% endif %}
{% if postfix_smtpd.tls_security_level is defined %}
smtpd_tls_security_level = {{ postfix_smtpd.tls_security_level }}
{% if postfix_smtpd.tls.auth_only is defined %}
smtpd_tls_auth_only = {{ postfix_smtpd.tls.auth_only }}
{% endif %}
{% if postfix_smtpd.tls_auth_only is defined %}
smtpd_tls_auth_only = {{ postfix_smtpd.tls_auth_only }}
{% if postfix_smtpd.tls.cert_file is defined %}
smtpd_tls_cert_file = {{ postfix_smtpd.tls.cert_file }}
{% endif %}
{% if postfix_smtpd.tls_cert_file is defined %}
smtpd_tls_cert_file = {{ postfix_smtpd.tls_cert_file }}
{% if postfix_smtpd.tls.key_file is defined %}
smtpd_tls_key_file = {{ postfix_smtpd.tls.key_file }}
{% endif %}
{% if postfix_smtpd.tls_key_file is defined %}
smtpd_tls_key_file = {{ postfix_smtpd.tls_key_file }}
{% if postfix_smtpd.tls.loglevel is defined %}
smtpd_tls_loglevel = {{ postfix_smtpd.tls.loglevel }}
{% endif %}
{% if postfix_smtpd.tls_loglevel is defined %}
smtpd_tls_loglevel = {{ postfix_smtpd.tls_loglevel }}
{% if postfix_smtpd.tls.received_header is defined %}
smtpd_tls_received_header = {{ postfix_smtpd.tls.received_header }}
{% endif %}
{% if postfix_smtpd.tls_received_header is defined %}
smtpd_tls_received_header = {{ postfix_smtpd.tls_received_header }}
{% if postfix_smtpd.tls.session_cache_timeout is defined %}
smtpd_tls_session_cache_timeout = {{ postfix_smtpd.tls.session_cache_timeout }}
{% endif %}
{% if postfix_smtpd.tls_session_cache_timeout is defined %}
smtpd_tls_session_cache_timeout = {{ postfix_smtpd.tls_session_cache_timeout }}
{% endif %}
{% endif %}
{% if postfix_tls_random_source is defined %}
Expand Down
52 changes: 26 additions & 26 deletions templates/redhat-7-main.cf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -708,46 +708,46 @@ readme_directory = /usr/share/doc/postfix-2.10.1/README_FILES
smtp_generic_maps = {{ postfix_smtp_generic_maps }}
{% endif %}
{% if postfix_smtp is defined %}
{% if postfix_smtp.tls_note_starttls_offer is defined %}
smtp_tls_note_starttls_offer = {{ postfix_smtp.tls_note_starttls_offer }}
{% if postfix_smtp.tls.note_starttls_offer is defined %}
smtp_tls_note_starttls_offer = {{ postfix_smtp.tls.note_starttls_offer }}
{% endif %}
{% if postfix_smtp.tls_CApath is defined %}
smtp_tls_CApath = {{ postfix_smtp.tls_CApath }}
{% if postfix_smtp.tls.CApath is defined %}
smtp_tls_CApath = {{ postfix_smtp.tls.CApath }}
{% endif %}
{% if postfix_smtp.tls_security_level is defined %}
smtp_tls_security_level = {{ postfix_smtp.tls_security_level }}
{% if postfix_smtp.tls.security_level is defined %}
smtp_tls_security_level = {{ postfix_smtp.tls.security_level }}
{% endif %}
{% if postfix_smtp.tls_cert_file is defined %}
smtp_tls_cert_file = {{ postfix_smtp.tls_cert_file }}
{% if postfix_smtp.tls.cert_file is defined %}
smtp_tls_cert_file = {{ postfix_smtp.tls.cert_file }}
{% endif %}
{% if postfix_smtp.tls_key_file is defined %}
smtp_tls_key_file = {{ postfix_smtp.tls_key_file }}
{% if postfix_smtp.tls.key_file is defined %}
smtp_tls_key_file = {{ postfix_smtp.tls.key_file }}
{% endif %}
{% endif %}
{% if postfix_smtpd is defined %}
{% if postfix_smtpd.tls_CApath is defined %}
smtpd_tls_CApath = {{ postfix_smtpd.tls_CApath }}
{% if postfix_smtpd.tls.CApath is defined %}
smtpd_tls_CApath = {{ postfix_smtpd.tls.CApath }}
{% endif %}
{% if postfix_smtpd.tls_security_level is defined %}
smtpd_tls_security_level = {{ postfix_smtpd.tls_security_level }}
{% if postfix_smtpd.tls.security_level is defined %}
smtpd_tls_security_level = {{ postfix_smtpd.tls.security_level }}
{% endif %}
{% if postfix_smtpd.tls_auth_only is defined %}
smtpd_tls_auth_only = {{ postfix_smtpd.tls_auth_only }}
{% if postfix_smtpd.tls.auth_only is defined %}
smtpd_tls_auth_only = {{ postfix_smtpd.tls.auth_only }}
{% endif %}
{% if postfix_smtpd.tls_cert_file is defined %}
smtpd_tls_cert_file = {{ postfix_smtpd.tls_cert_file }}
{% if postfix_smtpd.tls.cert_file is defined %}
smtpd_tls_cert_file = {{ postfix_smtpd.tls.cert_file }}
{% endif %}
{% if postfix_smtpd.tls_key_file is defined %}
smtpd_tls_key_file = {{ postfix_smtpd.tls_key_file }}
{% if postfix_smtpd.tls.key_file is defined %}
smtpd_tls_key_file = {{ postfix_smtpd.tls.key_file }}
{% endif %}
{% if postfix_smtpd.tls_loglevel is defined %}
smtpd_tls_loglevel = {{ postfix_smtpd.tls_loglevel }}
{% if postfix_smtpd.tls.loglevel is defined %}
smtpd_tls_loglevel = {{ postfix_smtpd.tls.loglevel }}
{% endif %}
{% if postfix_smtpd.tls_received_header is defined %}
smtpd_tls_received_header = {{ postfix_smtpd.tls_received_header }}
{% if postfix_smtpd.tls.received_header is defined %}
smtpd_tls_received_header = {{ postfix_smtpd.tls.received_header }}
{% endif %}
{% if postfix_smtpd.tls_session_cache_timeout is defined %}
smtpd_tls_session_cache_timeout = {{ postfix_smtpd.tls_session_cache_timeout }}
{% if postfix_smtpd.tls.session_cache_timeout is defined %}
smtpd_tls_session_cache_timeout = {{ postfix_smtpd.tls.session_cache_timeout }}
{% endif %}
{% endif %}
{% if postfix_tls_random_source is defined %}
Expand Down