diff --git a/smtprelay/Dockerfile b/smtprelay/Dockerfile index 20797fb..a7fe7f5 100644 --- a/smtprelay/Dockerfile +++ b/smtprelay/Dockerfile @@ -1,13 +1,17 @@ FROM alpine -RUN apk --update --no-cache add shadow opensmtpd opensmtpd-filter-dkimsign && \ - install -dm 711 /var/spool/smtpd && \ - groupmod -g 601 smtpd && \ - groupmod -g 602 smtpq && \ - groupmod -g 603 dkimsign && \ - usermod -u 601 -g smtpd smtpd && \ - usermod -u 602 -g smtpq smtpq && \ - usermod -u 603 -g dkimsign dkimsign && \ - chgrp smtpq /usr/sbin/smtpctl && \ - chmod g+s /usr/sbin/smtpctl && \ +RUN set -eux; \ + apk --update --no-cache add shadow opensmtpd opensmtpd-filter-dkimsign; \ + install -dm 711 /var/spool/smtpd; \ + groupmod -g 601 smtpd; \ + groupmod -g 602 smtpq; \ + groupmod -g 603 dkimsign; \ + usermod -u 601 -g smtpd smtpd; \ + usermod -u 602 -g smtpq smtpq; \ + usermod -u 603 -g dkimsign dkimsign; \ + chgrp smtpq /usr/sbin/smtpctl; \ + chmod g+s /usr/sbin/smtpctl; \ apk del shadow -ENTRYPOINT ["smtpd", "-d"] +EXPOSE 25 +EXPOSE 465 +EXPOSE 587 +CMD ["smtpd", "-d"] diff --git a/smtprelay/docker-compose.yml b/smtprelay/docker-compose.yml index c63c004..f13b58b 100644 --- a/smtprelay/docker-compose.yml +++ b/smtprelay/docker-compose.yml @@ -10,4 +10,5 @@ services: - ./opensmtpd:/etc/smtpd:ro - spool:/var/spool/smtpd ports: + - 465:465 - 587:587 diff --git a/smtprelay/opensmtpd/smtpd.conf b/smtprelay/opensmtpd/smtpd.conf index 1574043..b8053fe 100644 --- a/smtprelay/opensmtpd/smtpd.conf +++ b/smtprelay/opensmtpd/smtpd.conf @@ -5,6 +5,7 @@ table creds file:/etc/smtpd/creds filter "dkimsign" proc-exec "filter-dkimsign -d abzw.de -d codehal.de -s lok01 -k /etc/smtpd/dkim_rsa4096.key" user dkimsign group dkimsign +listen on eth0 port 465 smtps pki smtprelay.abzw.de auth listen on eth0 port 587 tls-require pki smtprelay.abzw.de auth listen on 127.0.0.1 port 10027 tag DKIM_SIGNED filter "dkimsign"