X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fmail%2Fopensmtpd.nix;fp=modules%2Fprivate%2Fmail%2Fopensmtpd.nix;h=e4a6140c21014217ec2fccf15751020c8d03f05e;hb=619e4f46adc15e409122c4e0fa0e0a0b811bb32f;hp=7831ac0d587bcf352426d72962b2e33ce74c16c6;hpb=fd2af8fa50dc1a60d40a1aa3c4252d8eb3abf5b0;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/mail/opensmtpd.nix b/modules/private/mail/opensmtpd.nix
index 7831ac0..e4a6140 100644
--- a/modules/private/mail/opensmtpd.nix
+++ b/modules/private/mail/opensmtpd.nix
@@ -8,7 +8,7 @@
         group = "smtpd";
         permissions = "0400";
         text = ''
-          eldiron    ${name}:${config.myEnv.servers."${name}".ldap.password}
+          eldiron    ${name}:${config.hostEnv.ldap.password}
           '';
       }
     ];
@@ -22,12 +22,12 @@
         # filter "fixfrom" \
         #   proc-exec "${pkgs.procmail}/bin/formail -i 'From: ${name}@immae.eu'"
         action "relay-rewrite-from" relay \
-          helo ${config.hostEnv.FQDN} \
+          helo ${config.hostEnv.fqdn} \
           host smtp+tls://eldiron@eldiron.immae.eu:587 \
           auth <creds> \
           mail-from ${name}@immae.eu
         action "relay" relay \
-          helo ${config.hostEnv.FQDN} \
+          helo ${config.hostEnv.fqdn} \
           host smtp+tls://eldiron@eldiron.immae.eu:587 \
           auth <creds>
         match for any !mail-from "@immae.eu" action "relay-rewrite-from"