Skip to content

Commit cff1291

Browse files
committed
Remove LS support when dropping mails
Note that TLS is still used for the connection to the external SMTP server. Removal of TLS is particularly useful for Go programs that refuse to connect without TLS if TLS is available, making copying the snakeoil certificate into the Go program’s container. This is awkward, and brakes once the certificate changes. Besides, the hard-coded DNS name “postfix” has been the source of trouble because sometimes, you have to contact the container under a different name. If this turns out to be a bad idea, I have to do it completely differently, e.g. by allowing to mount a certificate into the container.
1 parent 3bccb70 commit cff1291

2 files changed

Lines changed: 1 addition & 16 deletions

File tree

Dockerfile

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,21 +64,15 @@ RUN mkdir /etc/sigh
6464
COPY sigh.cfg /etc/sigh/
6565
RUN mkdir "$SIGH_ROOT"; chown filter "$SIGH_ROOT"
6666

67-
COPY csr.conf /tmp
68-
RUN openssl req -x509 -days 3650 -key /etc/ssl/private/ssl-cert-snakeoil.key \
69-
-out /etc/ssl/certs/ssl-cert-snakeoil-postfix.pem -config /tmp/csr.conf -extensions v3_req && \
70-
rm /tmp/csr.conf
71-
RUN openssl x509 -in /etc/ssl/certs/ssl-cert-snakeoil-postfix.pem -text
72-
7367
RUN postconf -e "smtp_sasl_auth_enable=yes" && \
7468
postconf -e "smtp_tls_security_level=may" && \
7569
postconf -e "smtp_sasl_mechanism_filter=!ntlm,static:rest" && \
7670
postconf -e "smtp_tls_CAfile=/etc/ssl/certs/ca-certificates.crt" && \
77-
postconf -e "smtpd_tls_cert_file=/etc/ssl/certs/ssl-cert-snakeoil-postfix.pem" && \
7871
postconf -e "smtp_sasl_tls_security_options=noanonymous" && \
7972
postconf -e "smtp_sasl_password_maps=hash:/etc/postfix/relay_passwd" && \
8073
postconf -e "mynetworks=127.0.0.0/8 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 [::ffff:127.0.0.0]/104 [::1]/128" && \
8174
postconf -e "smtpd_milters=inet:localhost:4000" && \
75+
postconf -e "smtpd_tls_security_level=none" && \
8276
postconf -e "local_header_rewrite_clients=permit_mynetworks" && \
8377
postconf -M "submission/inet=submission inet n - n - - smtpd" && \
8478
postconf -M "smtp/unix=smtp unix - - n - - smtp"

csr.conf

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)