Add specification for the private config file as a module.

[perso/Immae/Config/Nix.git] / modules / private / mail / milters.nix

diff --git a/modules/private/mail/milters.nix b/modules/private/mail/milters.nix
index 123af4ab650b554730fa2fe5b0cc6c0e8aea7a29..6b033e86102c4b684c115cf11cf31e220c0c3949 100644 (file)
--- a/modules/private/mail/milters.nix
+++ b/modules/private/mail/milters.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, config, myconfig,  ... }:
+{ lib, pkgs, config, ... }:
 {
   options.myServices.mail.milters.sockets = lib.mkOption {
     type = lib.types.attrsOf lib.types.path;
@@ -19,7 +19,7 @@
         user = config.services.opendkim.user;
         group = config.services.opendkim.group;
         permissions = "0400";
-        text = myconfig.env.mail.dkim.eldiron.private;
+        text = config.myEnv.mail.dkim.eldiron.private;
       }
       {
         dest = "opendkim/eldiron.txt";
@@ -27,14 +27,14 @@
         group = config.services.opendkim.group;
         permissions = "0444";
         text = ''
-          eldiron._domainkey   IN      TXT     ${myconfig.env.mail.dkim.eldiron.public}'';
+          eldiron._domainkey   IN      TXT     ${config.myEnv.mail.dkim.eldiron.public}'';
       }
       {
         dest = "opendmarc/ignore.hosts";
         user = config.services.opendmarc.user;
         group = config.services.opendmarc.group;
         permissions = "0400";
-        text = myconfig.env.mail.dmarc.ignore_hosts;
+        text = config.myEnv.mail.dmarc.ignore_hosts;
       }
     ];
     users.users."${config.services.opendkim.user}".extraGroups = [ "keys" ];
@@ -46,7 +46,7 @@
           (e: "${e.domain}${lib.optionalString (e.domain != "") "."}${zone.name}")
           (zone.withEmail or [])
         )
-        myconfig.env.dns.masterZones
+        config.myEnv.dns.masterZones
       ));
       keyPath = "${config.secrets.location}/opendkim";
       selector = "eldiron";