From 05dc9b467171b058aba1d5486b8f75f8aa13b243 Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Sat, 9 Mar 2024 12:40:02 +0100
Subject: [PATCH] falkenstein.vpn -> falkenstein

---
 hosts/falkenstein/modules/mail/default.nix     | 4 ++--
 hosts/falkenstein/modules/networks/default.nix | 6 +++++-
 hosts/thinkpad/modules/networks/default.nix    | 2 +-
 users/rouven/modules/ssh/default.nix           | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/hosts/falkenstein/modules/mail/default.nix b/hosts/falkenstein/modules/mail/default.nix
index 1e96bae..4f5ef3f 100644
--- a/hosts/falkenstein/modules/mail/default.nix
+++ b/hosts/falkenstein/modules/mail/default.nix
@@ -44,7 +44,8 @@ in
       sslKey = "/var/lib/acme/${hostname}/key.pem";
       config = {
         home_mailbox = "Maildir/";
-        smtp_helo_name = "falkenstein.vpn.rfive.de";
+        smtp_helo_name = config.networking.fqdn;
+        smtpd_banner = "${config.networking.fqdn} ESMTP $mail_name";
         smtp_use_tls = true;
         smtpd_use_tls = true;
         smtpd_tls_protocols = [
@@ -220,7 +221,6 @@ in
         "dkim_signing.conf".text = ''
           selector = "rspamd";
           allow_username_mismatch = true;
-          allow_hdrfrom_mismatch = true;
           path = /var/lib/rspamd/dkim/$domain.key;
         '';
       };
diff --git a/hosts/falkenstein/modules/networks/default.nix b/hosts/falkenstein/modules/networks/default.nix
index 4452579..163bf41 100644
--- a/hosts/falkenstein/modules/networks/default.nix
+++ b/hosts/falkenstein/modules/networks/default.nix
@@ -31,6 +31,10 @@
       "2620:fe::fe"
       "2620:fe::9"
     ];
+    extraConfig = ''
+      [Resolve]
+      DNSStubListener=no
+    '';
   };
   systemd.network = {
     enable = true;
@@ -72,7 +76,7 @@
           wireguardPeerConfig = {
             PublicKey = "Z5lwwHTCDr6OF4lfaCdSHNveunOn4RzuOQeyB+El9mQ=";
             PresharedKeyFile = config.age.secrets."wireguard/dorm/preshared".path;
-            Endpoint = "dorm.vpn.rfive.de:51820";
+            Endpoint = "nuc.rfive.de:51820";
             AllowedIPs = "192.168.42.0/24, 192.168.43.0/24";
           };
         }
diff --git a/hosts/thinkpad/modules/networks/default.nix b/hosts/thinkpad/modules/networks/default.nix
index 3d1cbdb..7bfaf31 100644
--- a/hosts/thinkpad/modules/networks/default.nix
+++ b/hosts/thinkpad/modules/networks/default.nix
@@ -151,7 +151,7 @@
           wireguardPeerConfig = {
             PublicKey = "Z5lwwHTCDr6OF4lfaCdSHNveunOn4RzuOQeyB+El9mQ=";
             PresharedKeyFile = config.age.secrets."wireguard/dorm/preshared".path;
-            Endpoint = "dorm.vpn.rfive.de:51820";
+            Endpoint = "nuc.rfive.de:51820";
             AllowedIPs = "192.168.42.0/24, 192.168.43.0/24";
           };
         }
diff --git a/users/rouven/modules/ssh/default.nix b/users/rouven/modules/ssh/default.nix
index fb95c2e..59fd80d 100644
--- a/users/rouven/modules/ssh/default.nix
+++ b/users/rouven/modules/ssh/default.nix
@@ -22,7 +22,7 @@ in
         identityFile = git;
       };
       "rfive.de" = {
-        hostname = "falkenstein.vpn.rfive.de";
+        hostname = "falkenstein.rfive.de";
         user = "root";
         extraOptions = {
           VerifyHostKeyDNS = "yes";