Notify IPs aren't in the zone
This commit is contained in:
parent
601a04b882
commit
6ba1ceff20
@ -106,14 +106,13 @@ in {
|
|||||||
stateDirectory = cfg.state-directory;
|
stateDirectory = cfg.state-directory;
|
||||||
zones = let
|
zones = let
|
||||||
forwardZones = mapAttrs' (domain:
|
forwardZones = mapAttrs' (domain:
|
||||||
{ ksk, zone, ... }:
|
{ ksk, zone, notify, ... }:
|
||||||
nameValuePair "${domain}." {
|
nameValuePair "${domain}." {
|
||||||
dnssec = ksk.key-file != null;
|
dnssec = ksk.key-file != null;
|
||||||
ksk.keyFile = ksk.key-file;
|
ksk.keyFile = ksk.key-file;
|
||||||
provideXFR = (map (ns: "${ns}/32 NOKEY") zone.notify.ipv4)
|
provideXFR = (map (ns: "${ns}/32 NOKEY") notify.ipv4)
|
||||||
++ (map (ns: "${ns}/64 NOKEY") zone.notify.ipv6);
|
++ (map (ns: "${ns}/64 NOKEY") notify.ipv6);
|
||||||
notify =
|
notify = map (ns: "${ns} NOKEY") (notify.ipv4 ++ notify.ipv6);
|
||||||
map (ns: "${ns} NOKEY") (zone.notify.ipv4 ++ zone.notify.ipv6);
|
|
||||||
data = zoneToZonefile {
|
data = zoneToZonefile {
|
||||||
inherit domain;
|
inherit domain;
|
||||||
inherit (cfg) timestamp;
|
inherit (cfg) timestamp;
|
||||||
@ -121,11 +120,11 @@ in {
|
|||||||
};
|
};
|
||||||
}) cfg.domains;
|
}) cfg.domains;
|
||||||
reverseZones = concatMapAttrs (domain:
|
reverseZones = concatMapAttrs (domain:
|
||||||
{ ksk, zone, reverse-zones, ... }:
|
{ ksk, zone, reverse-zones, notify, ... }:
|
||||||
listToAttrs (map (network:
|
listToAttrs (map (network:
|
||||||
reverseZonefile {
|
reverseZonefile {
|
||||||
inherit domain network;
|
inherit domain network notify;
|
||||||
inherit (zone) nameservers notify;
|
inherit (zone) nameservers;
|
||||||
keyFile = ksk.key-file;
|
keyFile = ksk.key-file;
|
||||||
ipHostMap = cfg.ip-host-map;
|
ipHostMap = cfg.ip-host-map;
|
||||||
serial = cfg.timestamp;
|
serial = cfg.timestamp;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user