summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVivien Kraus <vivien@planete-kraus.eu>2021-12-14 11:17:24 +0100
committerVivien Kraus <vivien@planete-kraus.eu>2021-12-14 11:17:24 +0100
commit18533bd54b3564e5a5aa1323dd9af415b2e2fdab (patch)
tree8aad00175610eb6bd5bb2de5d2c0d3419db088db
parentdbdbff23558e8b32be62f5c15c6827aa91d671a3 (diff)
Revert "smtp: listen on an interface, not an address."
This reverts commit dbdbff23558e8b32be62f5c15c6827aa91d671a3. Listening on interfaces seems to make the smtp server fail to start with: Dec 14 11:12:44 localhost smtpd[710]: info: OpenSMTPD 6.8.0p2 starting Dec 14 11:12:44 localhost smtpd[715]: pony express: listen: Address already in use Dec 14 11:12:44 localhost smtpd[711]: smtpd: process pony socket closed
-rw-r--r--guix/vkraus/modules/mail.scm14
1 files changed, 9 insertions, 5 deletions
diff --git a/guix/vkraus/modules/mail.scm b/guix/vkraus/modules/mail.scm
index acd9572..29dac4e 100644
--- a/guix/vkraus/modules/mail.scm
+++ b/guix/vkraus/modules/mail.scm
@@ -7,7 +7,7 @@
#:use-module (ice-9 match)
#:use-module (ice-9 optargs))
-(define-public (make-smtp-service domain interface)
+(define-public (make-smtp-service domain)
(let ((cfg
(mixed-text-file "opensmtpd-configuration"
"
@@ -19,11 +19,15 @@ pki " domain " key \"/etc/letsencrypt/live/" domain "/privkey.pem\"
include \"/etc/smtpd/srs.conf\"
-listen on " interface " port 25 tls pki " domain "
-listen on " interface " port 587 tls-require pki " domain " mask-src auth
-listen on " interface " port 465 smtps pki " domain " mask-src auth
+listen on 0.0.0.0 port 25 tls pki " domain "
+listen on :: port 25 tls pki " domain "
+listen on 0.0.0.0 port 587 tls-require pki " domain " mask-src auth
+listen on :: port 587 tls-require pki " domain " mask-src auth
+listen on 0.0.0.0 port 465 smtps pki " domain " mask-src auth
+listen on :: port 465 smtps pki " domain " mask-src auth
listen on socket mask-src
-listen on lo port 10028 tag DKIM_SIGNED
+listen on 127.0.0.1 port 10028 tag DKIM_SIGNED
+listen on :: port 10028 tag DKIM_SIGNED
action receive maildir alias <aliases>
action send relay helo " domain " srs