1 files changed, 8 insertions, 8 deletions

diff --git a/hosts/surtr/email/default.nix b/hosts/surtr/email/default.nix
index 59639bec..8eb19b6b 100644
--- a/hosts/surtr/email/default.nix
+++ b/hosts/surtr/email/default.nix
@@ -146,7 +146,7 @@ in {
       setSendmail = true;
       postmasterAlias = ""; rootAlias = ""; extraAliases = "";
       settings.main = {
-        recpipient_delimiter = "";
+        recipient_delimiter = "";
         mydestination = [];
         mynetworks = [];
         myhostname = "surtr.yggdrasil.li";
@@ -157,8 +157,6 @@ in {
           "/run/credentials/postfix.service/surtr.yggdrasil.li.full.pem"
         ];
 
-        #enable ECDH
-        smtpd_tls_eecdh_grade = "strong";
         #enabled SSL protocols, don't allow SSLv2 and SSLv3
         smtpd_tls_protocols = ["!SSLv2" "!SSLv3" "!TLSv1" "!TLSv1.1"];
         smtpd_tls_mandatory_protocols = ["!SSLv2" "!SSLv3" "!TLSv1" "!TLSv1.1"];
@@ -239,7 +237,6 @@ in {
 
         propagate_unmatched_extensions = ["canonical" "virtual" "alias"];
         smtpd_authorized_verp_clients = "";
-        authorized_verp_clients = "";
 
         smtpd_client_event_limit_exceptions = "";
 
@@ -256,7 +253,8 @@ in {
         bounce_queue_lifetime = "20m";
         delay_warning_time = "10m";
 
-        failure_template_file = toString (pkgs.writeText "failure.cf" ''
+        bounce_template_file = pkgs.writeText "bounce.cf" ''
+          failure_template = <<EOF
           Charset: us-ascii
           From: Mail Delivery System <MAILER-DAEMON>
           Subject: Undelivered Mail Returned to Sender
@@ -268,8 +266,9 @@ in {
           be delivered to one or more recipients. It's attached below.
 
                              The mail system
-        '');
-        delay_template_file = toString (pkgs.writeText "delay.cf" ''
+          EOF
+
+          delay_template = <<EOF
           Charset: us-ascii
           From: Mail Delivery System <MAILER-DAEMON>
           Subject: Delayed Mail (still being retried)
@@ -285,7 +284,8 @@ in {
           It will be retried until it is $maximal_queue_lifetime_minutes minute(s) old.
 
                              The mail system
-        '');
+          EOF
+        '';
 
         smtpd_discard_ehlo_keyword_address_maps = "cidr:${pkgs.writeText "esmtp_access" ''
           # Allow DSN requests from local subnet only