1 files changed, 24 insertions, 24 deletions

diff --git a/modules/private/mail/postfix.nix b/modules/private/mail/postfix.nix
index a679027..f8f86f6 100644
--- a/modules/private/mail/postfix.nix
+++ b/modules/private/mail/postfix.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, config, myconfig, ... }:
+{ lib, pkgs, config, ... }:
 {
   config = lib.mkIf config.myServices.mail.enable {
     services.duplyBackup.profiles.mail.excludeFile = ''
@@ -13,10 +13,10 @@
         text = ''
           # We need to specify that option to trigger ssl connection
           tls_ciphers = TLSv1.2
-          user = ${myconfig.env.mail.postfix.mysql.user}
-          password = ${myconfig.env.mail.postfix.mysql.password}
-          hosts = unix:${myconfig.env.mail.postfix.mysql.socket}
-          dbname = ${myconfig.env.mail.postfix.mysql.database}
+          user = ${config.myEnv.mail.postfix.mysql.user}
+          password = ${config.myEnv.mail.postfix.mysql.password}
+          hosts = unix:${config.myEnv.mail.postfix.mysql.socket}
+          dbname = ${config.myEnv.mail.postfix.mysql.database}
           query = SELECT DISTINCT destination
             FROM forwardings_merge
             WHERE
@@ -41,10 +41,10 @@
         text = ''
           # We need to specify that option to trigger ssl connection
           tls_ciphers = TLSv1.2
-          user = ${myconfig.env.mail.postfix.mysql.user}
-          password = ${myconfig.env.mail.postfix.mysql.password}
-          hosts = unix:${myconfig.env.mail.postfix.mysql.socket}
-          dbname = ${myconfig.env.mail.postfix.mysql.database}
+          user = ${config.myEnv.mail.postfix.mysql.user}
+          password = ${config.myEnv.mail.postfix.mysql.password}
+          hosts = unix:${config.myEnv.mail.postfix.mysql.socket}
+          dbname = ${config.myEnv.mail.postfix.mysql.database}
           result_format = /%d/%u
           query = SELECT DISTINCT '%s'
             FROM mailboxes
@@ -68,10 +68,10 @@
         text = ''
           # We need to specify that option to trigger ssl connection
           tls_ciphers = TLSv1.2
-          user = ${myconfig.env.mail.postfix.mysql.user}
-          password = ${myconfig.env.mail.postfix.mysql.password}
-          hosts = unix:${myconfig.env.mail.postfix.mysql.socket}
-          dbname = ${myconfig.env.mail.postfix.mysql.database}
+          user = ${config.myEnv.mail.postfix.mysql.user}
+          password = ${config.myEnv.mail.postfix.mysql.password}
+          hosts = unix:${config.myEnv.mail.postfix.mysql.socket}
+          dbname = ${config.myEnv.mail.postfix.mysql.database}
           query = SELECT DISTINCT destination
             FROM forwardings_merge
             WHERE
@@ -132,7 +132,7 @@
           '';
         scripts = lib.attrsets.mapAttrs (n: v:
           toScript n (pkgs.callPackage (builtins.fetchGit { url = v.src.url; ref = "master"; rev = v.src.rev; }) { scriptEnv = v.env; })
-        ) myconfig.env.mail.scripts;
+        ) config.myEnv.mail.scripts;
       in builtins.concatStringsSep "\n" (lib.attrsets.mapAttrsToList (n: v: ''${n}: "|${v}"'') scripts);
       mapFiles = let
         recipient_maps = let
@@ -145,7 +145,7 @@
           pairs = n: v: lib.imap1 (i: m: pair n i m) v.recipient_maps;
         in lib.attrsets.filterAttrs (k: v: v != null) (
           lib.attrsets.listToAttrs (lib.flatten (
-            lib.attrsets.mapAttrsToList pairs myconfig.env.mail.postfix.backup_domains
+            lib.attrsets.mapAttrsToList pairs config.myEnv.mail.postfix.backup_domains
           ))
         );
         relay_restrictions = lib.attrsets.filterAttrs (k: v: v != null) (
@@ -155,7 +155,7 @@
               then pkgs.writeText "recipient_access_${n}" v.relay_restrictions
               else null
             )
-          ) myconfig.env.mail.postfix.backup_domains
+          ) config.myEnv.mail.postfix.backup_domains
         );
         virtual_map = {
           virtual = pkgs.writeText "postfix-virtual" (
@@ -164,7 +164,7 @@
                 n: v: ''
                   script_${n}@mail.immae.eu ${n}@localhost, scripts@mail.immae.eu
                 ''
-              ) myconfig.env.mail.scripts
+              ) config.myEnv.mail.scripts
             )
           );
         };
@@ -183,7 +183,7 @@
 
         ### Virtual mailboxes config
         virtual_alias_maps = "hash:/etc/postfix/virtual mysql:${config.secrets.fullPaths."postfix/mysql_alias_maps"}";
-        virtual_mailbox_domains = myconfig.env.mail.postfix.additional_mailbox_domains
+        virtual_mailbox_domains = config.myEnv.mail.postfix.additional_mailbox_domains
         ++ lib.remove "localhost.immae.eu" (lib.remove null (lib.flatten (map
             (zone: map
               (e: if e.receive
@@ -192,17 +192,17 @@
               )
               (zone.withEmail or [])
             )
-            myconfig.env.dns.masterZones
+            config.myEnv.dns.masterZones
           )));
         virtual_mailbox_maps = "mysql:${config.secrets.fullPaths."postfix/mysql_mailbox_maps"}";
         dovecot_destination_recipient_limit = "1";
         virtual_transport = "dovecot";
 
         ### Relay domains
-        relay_domains = lib.flatten (lib.attrsets.mapAttrsToList (n: v: v.domains or []) myconfig.env.mail.postfix.backup_domains);
+        relay_domains = lib.flatten (lib.attrsets.mapAttrsToList (n: v: v.domains or []) config.myEnv.mail.postfix.backup_domains);
         relay_recipient_maps = lib.flatten (lib.attrsets.mapAttrsToList (n: v:
           lib.imap1 (i: m: "${m.type}:/etc/postfix/relay_${n}_${toString i}") v.recipient_maps
-        ) myconfig.env.mail.postfix.backup_domains);
+        ) config.myEnv.mail.postfix.backup_domains);
         smtpd_relay_restrictions = [
           "permit_mynetworks"
           "permit_sasl_authenticated"
@@ -211,7 +211,7 @@
           if lib.attrsets.hasAttr "relay_restrictions" v
           then [ "check_recipient_access hash:/etc/postfix/recipient_access_${n}" ]
           else []
-        ) myconfig.env.mail.postfix.backup_domains);
+        ) config.myEnv.mail.postfix.backup_domains);
 
         ### Additional smtpd configuration
         smtpd_tls_received_header = "yes";
@@ -222,8 +222,8 @@
         smtp_tls_loglevel = "1";
 
         ### Force ip bind for smtp
-        smtp_bind_address  = myconfig.env.servers.eldiron.ips.main.ip4;
-        smtp_bind_address6 = builtins.head myconfig.env.servers.eldiron.ips.main.ip6;
+        smtp_bind_address  = config.myEnv.servers.eldiron.ips.main.ip4;
+        smtp_bind_address6 = builtins.head config.myEnv.servers.eldiron.ips.main.ip6;
 
         # #Unneeded if postfix can only send e-mail from "self" domains
         # #smtp_sasl_auth_enable = "yes";