From 8c4029159803fc7aab59b5d68bcb2ec902988a9d Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Sat, 21 Mar 2026 14:09:41 +0100 Subject: (users id1000): listen for email on enp2s0 to disambiguate domain and certificate names --- deployment/systems/aisaka.scm | 8 +++----- users/id1000.scm | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/deployment/systems/aisaka.scm b/deployment/systems/aisaka.scm index 6dab453..3377da2 100644 --- a/deployment/systems/aisaka.scm +++ b/deployment/systems/aisaka.scm @@ -90,10 +90,7 @@ ("www" ttl "IN" "A" ip-multimedia) ("ns2" ttl "IN" "A" ip-multimedia) ("@" ttl "IN" "NS" "ns2.marekpasnikowski.pl.") - ("@" ttl "IN" "MX" "10 mx1.forwardemail.net.") - ("@" ttl "IN" "MX" "10 mx2.forwardemail.net.") - ("@" ttl "IN" "TXT" "\"forward-email-port=49152\"") - ("@" ttl "IN" "TXT" "\"forward-email=marekpasnikowski.pl\"") + ("@" ttl "IN" "MX" "10 marekpasnikowski.pl.") ("@" ttl "IN" "TXT" spf-value) ("_caldavs._tcp" ttl "IN" "SRV" "10 0 443 radicale.marekpasnikowski.pl") ("_carddavs._tcp" ttl "IN" "SRV" "10 0 443 radicale.marekpasnikowski.pl") @@ -113,7 +110,7 @@ (origin "marekpasnikowski.pl") (ns "ns1.marekpasnikowski.pl.") (mail "marek.marekpasnikowski.pl.") - (serial 2026032000))) + (serial 2026032103))) (define master-zone (gnu:services:dns:knot-zone-configuration @@ -402,6 +399,7 @@ "git.marekpasnikowski.pl" "guix.marekpasnikowski.pl" "matrix.marekpasnikowski.pl" + "mx.marekpasnikowski.pl" "radicale.marekpasnikowski.pl" "schron.marekpasnikowski.pl" "sejf.marekpasnikowski.pl" diff --git a/users/id1000.scm b/users/id1000.scm index e6fcffd..ead0793 100644 --- a/users/id1000.scm +++ b/users/id1000.scm @@ -292,13 +292,13 @@ (define dovecot-imap-login-inet-configuration ((@ (gnu services mail) inet-listener-configuration) - (address "192.168.10.2") + (address "192.168.1.2") (port 993) (protocol "imaps"))) (define dovecot-lmtp-inet-configuration ((@ (gnu services mail) inet-listener-configuration) - (address "192.168.10.2 127.0.0.1") + (address "192.168.1.2 127.0.0.1") (port 24) (protocol "lmtp"))) @@ -510,7 +510,7 @@ ((@ (gnu services mail) opensmtpd-configuration) (shepherd-requirement (list 'dkimproxy-out 'networking)) - (config-file (opensmtpd-config "enp1s0" + (config-file (opensmtpd-config "enp2s0" "marekpasnikowski.pl")))) ;;; -- cgit v1.3