Cleanup e-mails from immae.eu domains

[perso/Immae/Config/Nix.git] / nixops / modules / dns / default.nix

diff --git a/nixops/modules/dns/default.nix b/nixops/modules/dns/default.nix
index 793771481803bc437c3026c3fc362266d15aa8dd..34019d11fbfde857c1b1246fc84c3cef83f24dd6 100644 (file)
--- a/nixops/modules/dns/default.nix
+++ b/nixops/modules/dns/default.nix
@@ -68,8 +68,8 @@
         server-id none;
         '';
       zones = with myconfig.env.dns;
-        assert (builtins.substring ((builtins.stringLength soa.email)-1) 1 soa.email) == ".";
-        assert (builtins.substring ((builtins.stringLength soa.primary)-1) 1 soa.primary) == ".";
+        assert (builtins.substring ((builtins.stringLength soa.email)-1) 1 soa.email) != ".";
+        assert (builtins.substring ((builtins.stringLength soa.primary)-1) 1 soa.primary) != ".";
         (map (conf: {
           name = conf.name;
           master = false;
@@ -87,7 +87,7 @@
             else [];
           file = pkgs.writeText "${conf.name}.zone" ''
               $TTL 10800
-              @ IN SOA ${soa.primary} ${soa.email} ${soa.serial} ${soa.refresh} ${soa.retry} ${soa.expire} ${soa.ttl}
+              @ IN SOA ${soa.primary}. ${builtins.replaceStrings ["@"] ["."] soa.email}. ${soa.serial} ${soa.refresh} ${soa.retry} ${soa.expire} ${soa.ttl}
 
               ${lib.concatStringsSep "\n" (map (x: "@ IN NS ${x}.") (lib.concatMap (n: lib.attrsets.mapAttrsToList (k: v: k) ns.${n}) conf.ns))}