2 files changed, 19 insertions, 19 deletions

diff --git a/hosts/sif/email/default.nix b/hosts/sif/email/default.nix
index 4eda236e..bebf7980 100644
--- a/hosts/sif/email/default.nix
+++ b/hosts/sif/email/default.nix
@@ -5,11 +5,12 @@
     enableSmtp = false;
     enableSubmission = false;
     setSendmail = true;
-    networksStyle = "host";
-    hostname = "sif.midgard.yggdrasil";
-    destination = [];
-    recipientDelimiter = "+";
-    config = {
+    # networksStyle = "host";
+    settings.main = {
+      recpipient_delimiter = "+";
+      mydestination = [];
+      myhostname = "sif.midgard.yggdrasil";
+
       mydomain = "yggdrasil.li";
 
       local_transport = "error:5.1.1 No local delivery";
@@ -19,7 +20,7 @@
 
       inet_interfaces = "loopback-only";
 
-      message_size_limit = "0";
+      message_size_limit = 0;
 
       authorized_submit_users = "inline:{ gkleen= }";
       authorized_flush_users = "inline:{ gkleen= }";
@@ -41,7 +42,7 @@
         /^uni2work(-[^@]*)?@ifi\.lmu\.de$/ uni2work@ifi.lmu.de
         /@ifi\.lmu\.de$/ gregor.kleen@ifi.lmu.de
       ''}'';
-      relayhost = "[surtr.yggdrasil.li]:465";
+      relayhost = ["[surtr.yggdrasil.li]:465"];
       default_transport = "relay";
 
       smtp_sasl_auth_enable = true;
@@ -56,7 +57,7 @@
       smtp_tls_loglevel = "1";
       smtp_dns_support_level = "dnssec";
     };
-    masterConfig = {
+    settings.master = {
       submission = {
         type = "inet";
         private = false;
diff --git a/hosts/surtr/email/default.nix b/hosts/surtr/email/default.nix
index de8a6730..a3e06ca6 100644
--- a/hosts/surtr/email/default.nix
+++ b/hosts/surtr/email/default.nix
@@ -124,13 +124,14 @@ in {
     services.postfix = {
       enable = true;
       enableSmtp = false;
-      hostname = "surtr.yggdrasil.li";
-      recipientDelimiter = "";
       setSendmail = true;
       postmasterAlias = ""; rootAlias = ""; extraAliases = "";
-      destination = [];
-      networks = [];
-      config = {
+      settings.main = {
+        recpipient_delimiter = "";
+        mydestination = [];
+        mynetworks = [];
+        myhostname = "surtr.yggdrasil.li";
+
         smtpd_tls_security_level = "may";
 
         smtpd_tls_chain_files = [
@@ -177,10 +178,8 @@ in {
 
         local_recipient_maps = "";
 
-        # 10 GiB
-        message_size_limit = "10737418240";
-        # 10 GiB
-        mailbox_size_limit = "10737418240";
+        message_size_limit = 10 * 1024 * 1024 * 1024;
+        mailbox_size_limit = 10 * 1024 * 1024 * 1024;
 
         smtpd_delay_reject = true;
         smtpd_helo_required = true;
@@ -280,7 +279,7 @@ in {
           query = SELECT value FROM recipient_bcc_maps WHERE key = '%s'
         ''}'';
       };
-      masterConfig = {
+      settings.master = {
         "465" = {
           type = "inet";
           private = false;
@@ -660,7 +659,7 @@ in {
           quota_status_success = DUNNO
           quota_status_nouser = DUNNO
           quota_grace = 10%%
-          quota_max_mail_size = ${config.services.postfix.config.message_size_limit}
+          quota_max_mail_size = ${toString config.services.postfix.settings.main.message_size_limit}
           quota_vsizes = yes
         }