Skip to content

Tls for postfix pr 2.x #1498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 11, 2024
Merged

Tls for postfix pr 2.x #1498

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
af33fff
Some Apache docs updates.
gregharvey Mar 11, 2024
598dfc8
Sorting TLS for SMTP in Postfix config.
gregharvey Mar 11, 2024
ad3be7f
Left bad domain in example cert paths.
gregharvey Mar 11, 2024
3ff265f
Typo in template var names.
gregharvey Mar 11, 2024
3b7200e
Merge branch '2.x' into tls_for_postfix-PR-2.x
gregharvey Mar 11, 2024
330982a
Merge branch 'tls_for_postfix' into tls_for_postfix-PR-2.x
gregharvey Mar 11, 2024
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
16 changes: 8 additions & 8 deletions roles/debian/postfix/templates/main.cf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@ smtp_sasl_password_maps = hash:/etc/postfix/sasl_passwd
{% if postfix.use_ses or postfix.ssl.enabled %}
smtp_use_tls = yes
smtp_tls_note_starttls_offer = yes
smtp_tls_CApath = {{ postix.ssl.smtp_tls_CApath }}
smtp_tls_CAfile = {{ postix.ssl.smtp_tls_CAfile }}
smtp_tls_CApath = {{ postfix.ssl.smtp_tls_CApath }}
smtp_tls_CAfile = {{ postfix.ssl.smtp_tls_CAfile }}
{% endif %}
{% if postfix.ssl.enabled %}
smtp_tls_cert_file = {{ postix.ssl.smtp_tls_cert_file }}
smtp_tls_key_file = {{ postix.ssl.smtp_tls_key_file }}
smtpd_tls_cert_file = {{ postix.ssl.smtp_tls_cert_file }}
smtpd_tls_key_file = {{ postix.ssl.smtp_tls_key_file }}
smtpd_tls_CApath = {{ postix.ssl.smtp_tls_CApath }}
smtpd_tls_CAfile = {{ postix.ssl.smtp_tls_CAfile }}
smtp_tls_cert_file = {{ postfix.ssl.smtp_tls_cert_file }}
smtp_tls_key_file = {{ postfix.ssl.smtp_tls_key_file }}
smtpd_tls_cert_file = {{ postfix.ssl.smtp_tls_cert_file }}
smtpd_tls_key_file = {{ postfix.ssl.smtp_tls_key_file }}
smtpd_tls_CApath = {{ postfix.ssl.smtp_tls_CApath }}
smtpd_tls_CAfile = {{ postfix.ssl.smtp_tls_CAfile }}
{% endif %}
{% if (is_local is defined) and is_local %}
# Force all mail to ce-dev user.
Expand Down