From 5d1e1f05460b395c32d3fd92f9d2e1120f60802a Mon Sep 17 00:00:00 2001 From: Steffen Lange Date: Wed, 8 Apr 2026 17:36:48 +0000 Subject: [PATCH] smtprelay: update credential hashes --- smtprelay/Dockerfile | 2 +- smtprelay/opensmtpd/creds | 9 ++++++--- smtprelay/opensmtpd/smtpd.conf | 6 +++--- smtprelay/smtpctl | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/smtprelay/Dockerfile b/smtprelay/Dockerfile index 2e7120d..20797fb 100644 --- a/smtprelay/Dockerfile +++ b/smtprelay/Dockerfile @@ -10,4 +10,4 @@ RUN apk --update --no-cache add shadow opensmtpd opensmtpd-filter-dkimsign && \ chgrp smtpq /usr/sbin/smtpctl && \ chmod g+s /usr/sbin/smtpctl && \ apk del shadow -ENTRYPOINT smtpd -d +ENTRYPOINT ["smtpd", "-d"] diff --git a/smtprelay/opensmtpd/creds b/smtprelay/opensmtpd/creds index 1aa4479..46bd014 100644 --- a/smtprelay/opensmtpd/creds +++ b/smtprelay/opensmtpd/creds @@ -1,3 +1,6 @@ -user1 $6$kHKLoDIKs/glvw9v$NlERi0VTXJw1Nxa6DQWv9k5DXZ5pvRIJo77j3CqpwJxhZkmvURClviSwyD1RLY7Y0EAlF44qFx7T1IfMwoGwl0 -user2 $6$MJI.2JXCp88rZbFg$Z5aiK3d001yycF21tXnWBbwsCyfDCLHPs0X1INM2Amj4GP/GxkV/NG.ZTELaD.BP3YOaCFo6PKqb2ns.Nmril. -user $6$VdLqPKptD5yxiY.j$xzHXVjzgmrwI3VV1uX8HKvbd1g/9jmZy3ygE94fz3u5KT5xye1m6vFB/4wm533oo3gY1VNoBAZHMIAvFY.JuI0 +bitwarden $6$kH/idHPlS82.Gwxl$1WyojLm9qihBL9meDBdEFAvvFeItGrcGeQkcr2fbzYRHDpeHUkXpU6jcf9hUOqQVovHp6z0E5YUJDi0f9RI5o0 +firefly $6$7H7eGxN8wNoa4Qip$cSz2mEjmrezVjmWyVBnWm8NklOZOjHmFpAjyFAhsDG2dPEEhJG23ZQvqHmGtLwlQ1ugUvdMIfZWr/Gj2YImUI1 +git $6$FIMHCuOaCXCZag3X$cqROqzXDKohUfLfVKtrzmuW.bVjdtPf3QPvrbyB4U7S0qrPoXG27QIADb.EdnseoMUUFRR3Yrd0VwgowF0Stl0 +loki $6$Bgrtp.TEwwsy0MLu$frEdzsGz.ea1TXHMp.y8ndDEevdLW3xvTTK995wSzbdBMrJoVL/Xms0YSZTDabrEgxEWDOM6NpMH4Zml/sc9Q. +nextcloud $6$ZHHzY9rYV062pe6u$e/B.gS7uhp65IW3Xe54Wl3Og57k6Y3GZVckXtJ3LHcCV58My5o663pSP.YunACjL/KGWLsyhmf.GT6OEeBNH70 +steffen $6$9HgdiGLU8kWFqYlx$eMW7D0CZdfEvFc3MzqVyt9QlSKxiew0IH.7lFRQGyRSUHNl.v9OoE2nh0MHc3aZ9KDBsU3ShiDz280BGUdlJD1 diff --git a/smtprelay/opensmtpd/smtpd.conf b/smtprelay/opensmtpd/smtpd.conf index 6eb2681..1574043 100644 --- a/smtprelay/opensmtpd/smtpd.conf +++ b/smtprelay/opensmtpd/smtpd.conf @@ -9,9 +9,9 @@ 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" action "relay_dkim" relay host smtp://127.0.0.1:10027 -action "send" relay +action "relay" relay -match tag DKIM_SIGNED for any action "send" +match tag DKIM_SIGNED for any action "relay" match from mail-from "@abzw.de" auth for any action "relay_dkim" match from mail-from "@codehal.de" auth for any action "relay_dkim" -match from any auth for any action "send" +match from any auth for any action "relay" diff --git a/smtprelay/smtpctl b/smtprelay/smtpctl index 960a011..cf6d14b 100755 --- a/smtprelay/smtpctl +++ b/smtprelay/smtpctl @@ -1,2 +1,2 @@ #!/bin/sh -docker compose exec smtprelay smtpctl "$@" +docker exec smtprelay smtpctl "$@"