From 0c0c944110d32447704d3b506a98c684fbdbb254 Mon Sep 17 00:00:00 2001
From: Till <till@ktiu.net>
Date: Wed, 14 Jan 2026 16:22:32 +0100
Subject: [PATCH] postfix config renames

---
 system/web-server/mail/postfix.nix | 60 +++++++++++++++---------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/system/web-server/mail/postfix.nix b/system/web-server/mail/postfix.nix
index 22c813a..16017dc 100644
--- a/system/web-server/mail/postfix.nix
+++ b/system/web-server/mail/postfix.nix
@@ -26,8 +26,6 @@ in {
 
   services.postfix = {
     enable = true;
-    domain = config.networking.domain;
-    hostname = config.networking.fqdn;
     virtual = ''
       @ktiu.net till.straube@t9e.me
       @t9e.me till.straube@t9e.me
@@ -38,25 +36,6 @@ in {
       @t9e.me anything
     '';
 
-    config = {
-      virtual_mailbox_domains = [ "t9e.me" "ktiu.net" ];
-      virtual_mailbox_maps = "hash:/etc/postfix/virtual-mailboxes";
-      virtual_transport = "lmtp:unix:/var/run/dovecot2/lmtp";
-      smtpd_tls_security_level = "may";
-    };
-
-    networks = [
-      "127.0.0.0/8"
-      "[::ffff:127.0.0.0]/104"
-      "[::1]/128"
-    ];
-
-    settings.main.smtpd_tls_chain_files = [
-      "${config.security.acme.certs."${config.networking.fqdn}-postfix".directory + "/key.pem"}"
-      "${config.security.acme.certs."${config.networking.fqdn}-postfix".directory + "/cert.pem"}"
-    ];
-    # sslKey = config.security.acme.certs."${config.networking.fqdn}-postfix".directory + "/key.pem";
-    # sslCert = config.security.acme.certs."${config.networking.fqdn}-postfix".directory + "/cert.pem";
 
     enableSubmission = true;
     submissionOptions = {
@@ -71,15 +50,38 @@ in {
       smtpd_recipient_restrictions = "reject_non_fqdn_recipient,reject_unknown_recipient_domain,permit_sasl_authenticated,reject";
     };
 
-    masterConfig = {
-      "submission-header-cleanup" = {
-        type = "unix";
-        private = false;
-        chroot = false;
-        maxproc = 0;
-        command = "cleanup";
-        args = ["-o" "header_checks=pcre:${submissionHeaderCleanupRules}"];
+    settings = {
+
+      main = {
+        virtual_mailbox_domains = [ "t9e.me" "ktiu.net" ];
+        virtual_mailbox_maps = "hash:/etc/postfix/virtual-mailboxes";
+        virtual_transport = "lmtp:unix:/var/run/dovecot2/lmtp";
+        smtpd_tls_security_level = "may";
+        mydomain = config.networking.domain;
+        myhostname = config.networking.fqdn;
+        mynetworks = [
+          "127.0.0.0/8"
+          "[::ffff:127.0.0.0]/104"
+          "[::1]/128"
+        ];
       };
+
+      master = {
+        "submission-header-cleanup" = {
+          type = "unix";
+          private = false;
+          chroot = false;
+          maxproc = 0;
+          command = "cleanup";
+          args = ["-o" "header_checks=pcre:${submissionHeaderCleanupRules}"];
+        };
+      };
+
+      smtpd_tls_chain_files = [
+        "${config.security.acme.certs."${config.networking.fqdn}-postfix".directory + "/key.pem"}"
+        "${config.security.acme.certs."${config.networking.fqdn}-postfix".directory + "/cert.pem"}"
+      ];
+
     };
   };
 }