From d5f575091136c18c5be6b8862ad692747429a5b6 Mon Sep 17 00:00:00 2001 From: andreas Date: Fri, 7 Apr 2023 15:45:32 +0000 Subject: [PATCH] fixed postfix configuration --- core/Dockerfile | 13 +- docker-compose.yml | 6 +- etc-zntrl/kopano/dagent.cfg | 2 +- etc-zntrl/kopano/server.cfg | 8 +- etc-zntrl/kopano/spooler.cfg | 2 +- .../kopano/ssl/certs/balusign-ca-chain.pem | 106 +++++++++ .../kopano/ssl/certs/balusign-signing-ca.pem | 70 ------ etc-zntrl/kopano/ssl/kopano.server.chain.crt | 98 -------- etc-zntrl/kopano/ssl/kopano.server.crt | 29 --- .../kopano/ssl/private/kopano.client.key | 57 ----- .../kopano/ssl/private/kopano.server.key | 57 ----- .../kopano/ssl/private/server-key-cert.pem | 81 +++++++ .../kopano/ssl/private/system-key-cert.pem | 81 +++++++ etc-zntrl/kopano/sslkeys/kopano.client.pem | 69 ------ .../kopano/sslkeys/system-public-key.pem | 11 + .../postfix/ssl/certs/balusign-signing-ca.pem | 154 ++++++++----- etc-zntrl/postfix/ssl/nuc0-full-chain.pem | 218 +++++++++++------- etc-zntrl/postfix/ssl/private/nuc0.lan.key | 66 +++--- etc-zntrl/postfix/virtual.db | Bin 12288 -> 0 bytes etc-zntrl/postfix/vmailbox.db | Bin 12288 -> 0 bytes postfix/Dockerfile | 14 +- postfix/Dockerfile.alpine | 10 + postfix/Dockerfile.ubuntu | 13 -- postfix/docker-compose.yml | 15 -- postfix/entrypoint.sh | 5 +- postfix/etc/postfix/main.cf | 59 +++++ postfix/etc/postfix/master.cf | 67 ++++++ .../postfix/ssl/certs/balusign-signing-ca.pem | 106 +++++++++ postfix/etc/postfix/ssl/nuc0-full-chain.pem | 148 ++++++++++++ postfix/etc/postfix/ssl/private/nuc0.lan.key | 40 ++++ postfix/etc/postfix/virtual | 3 + postfix/etc/postfix/vmailbox | 6 + webapp/Dockerfile | 7 +- z-push/Dockerfile | 8 +- 34 files changed, 1024 insertions(+), 605 deletions(-) create mode 100644 etc-zntrl/kopano/ssl/certs/balusign-ca-chain.pem delete mode 100644 etc-zntrl/kopano/ssl/certs/balusign-signing-ca.pem delete mode 100644 etc-zntrl/kopano/ssl/kopano.server.chain.crt delete mode 100644 etc-zntrl/kopano/ssl/kopano.server.crt delete mode 100644 etc-zntrl/kopano/ssl/private/kopano.client.key delete mode 100644 etc-zntrl/kopano/ssl/private/kopano.server.key create mode 100644 etc-zntrl/kopano/ssl/private/server-key-cert.pem create mode 100644 etc-zntrl/kopano/ssl/private/system-key-cert.pem delete mode 100644 etc-zntrl/kopano/sslkeys/kopano.client.pem create mode 100644 etc-zntrl/kopano/sslkeys/system-public-key.pem delete mode 100644 etc-zntrl/postfix/virtual.db delete mode 100644 etc-zntrl/postfix/vmailbox.db create mode 100644 postfix/Dockerfile.alpine delete mode 100644 postfix/Dockerfile.ubuntu delete mode 100644 postfix/docker-compose.yml create mode 100644 postfix/etc/postfix/main.cf create mode 100644 postfix/etc/postfix/master.cf create mode 100644 postfix/etc/postfix/ssl/certs/balusign-signing-ca.pem create mode 100644 postfix/etc/postfix/ssl/nuc0-full-chain.pem create mode 100644 postfix/etc/postfix/ssl/private/nuc0.lan.key create mode 100644 postfix/etc/postfix/virtual create mode 100644 postfix/etc/postfix/vmailbox diff --git a/core/Dockerfile b/core/Dockerfile index 56edd1e..234b88b 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:1.3-labs +# syntax=docker.io/docker/dockerfile:1.5.2 FROM ubuntu:20.04 RUN <m0tg_000IagfB*srAbRU$ZrcTl4RWU!xke={33UA>=#lJK5wy@&83HQDHn(HG;H}AuR1F9@~D~lvO>Pz~BF)K7Xz>94^Wa$xr(K{tW^B|6oW&009ILKmY** O5I_I{1Q0;r*8)!l%oqs( diff --git a/postfix/Dockerfile b/postfix/Dockerfile index a3a1ba8..d06cc64 100644 --- a/postfix/Dockerfile +++ b/postfix/Dockerfile @@ -1,8 +1,16 @@ -# syntax=docker/dockerfile:1 -FROM alpine:latest +# syntax=docker.io/docker/dockerfile:1.5.2 +FROM ubuntu:20.04 # install apt packages ENV TZ Europe/Berlin -RUN apk add --no-cache postfix spamassassin rsyslog logrotate xz +RUN <>/etc/mailname +EOF +COPY etc/postfix/ /etc/postfix/ COPY --chmod=0775 entrypoint.sh /entrypoint.sh EXPOSE 25 VOLUME /var/spool/postfix diff --git a/postfix/Dockerfile.alpine b/postfix/Dockerfile.alpine new file mode 100644 index 0000000..3fd2e21 --- /dev/null +++ b/postfix/Dockerfile.alpine @@ -0,0 +1,10 @@ +# syntax=docker.io/docker/dockerfile:1.5.2 +FROM alpine:latest +# install apt packages +ENV TZ Europe/Berlin +RUN apk add --no-cache postfix spamassassin rsyslog logrotate xz +COPY --chmod=0775 entrypoint.sh /entrypoint.sh +EXPOSE 25 +VOLUME /var/spool/postfix +ENTRYPOINT ["/entrypoint.sh"] +CMD ["postfix", "start-fg"] \ No newline at end of file diff --git a/postfix/Dockerfile.ubuntu b/postfix/Dockerfile.ubuntu deleted file mode 100644 index 19c729a..0000000 --- a/postfix/Dockerfile.ubuntu +++ /dev/null @@ -1,13 +0,0 @@ -# syntax=docker/dockerfile:1.3-labs -FROM ubuntu:20.04 -# install apt packages -RUN <