From 0f466f6d5aec0d3fcf406fe2bb71effa5a1a1386 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sat, 13 Apr 2019 10:41:30 +0200 Subject: Cleanup e-mails from immae.eu domains --- nixops/modules/dns/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nixops/modules/dns/default.nix') diff --git a/nixops/modules/dns/default.nix b/nixops/modules/dns/default.nix index 7937714..34019d1 100644 --- 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))} -- cgit v1.2.3