From 07d2c6205b8abc788757ca749c01739b3db89d61 Mon Sep 17 00:00:00 2001 From: niten Date: Thu, 2 Nov 2023 10:13:46 -0700 Subject: [PATCH] Need to leave makeHostRecords as string for other hosts --- zone-to-zonefile.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zone-to-zonefile.nix b/zone-to-zonefile.nix index f09390e..27451e2 100644 --- a/zone-to-zonefile.nix +++ b/zone-to-zonefile.nix @@ -90,7 +90,7 @@ let optional (ipv6-address != null) "${hostname} IN AAAA ${ipv6-address}"; descriptionRecord = optional (description != null) ''${hostname} IN TXT "${description}"''; - in aRecord ++ aaaaRecord ++ sshfpRecords ++ descriptionRecord; + in joinLines (aRecord ++ aaaaRecord ++ sshfpRecords ++ descriptionRecord); cnameRecord = alias: host: "${alias} IN CNAME ${host}"; @@ -107,7 +107,7 @@ let domainRecords = domain: zone: let - defaultHostRecords = optionals (zone.default-host != null) + defaultHostRecords = optionalString (zone.default-host != null) (makeHostRecords "@" zone.default-host); kerberosRecord = optionalString (zone.gssapi-realm != null) @@ -121,7 +121,7 @@ let $ORIGIN ${domain}. $TTL ${zone.default-ttl} - ${joinLines defaultHostRecords} + ${defaultHostRecords} ${joinLines (mxRecords zone.mx)}