nix/lib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove fudo namespace from call

Browse Source
This commit is contained in:
niten 2021-11-22 14:49:36 -08:00
parent 283d30fa6c
commit 30150e46de
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/fudo/local-network.nix
View File

@ -115,20 +115,20 @@ in {
interfaces = cfg.dhcp-interfaces; interfaces = cfg.dhcp-interfaces;
extraConfig = '' extraConfig = ''
subnet ${pkgs.lib.fudo.ip.getNetworkBase cfg.network} netmask ${ subnet ${pkgs.lib.ip.getNetworkBase cfg.network} netmask ${
pkgs.lib.fudo.ip.maskFromV32Network cfg.network pkgs.lib.ip.maskFromV32Network cfg.network
} { } {
authoritative; authoritative;
option subnet-mask ${pkgs.lib.fudo.ip.maskFromV32Network cfg.network}; option subnet-mask ${pkgs.lib.ip.maskFromV32Network cfg.network};
option broadcast-address ${pkgs.lib.fudo.ip.networkMaxIp cfg.network}; option broadcast-address ${pkgs.lib.ip.networkMaxIp cfg.network};
option routers ${cfg.gateway}; option routers ${cfg.gateway};
option domain-name-servers ${concatStringsSep " " cfg.dns-servers}; option domain-name-servers ${concatStringsSep " " cfg.dns-servers};
option domain-name "${cfg.domain}"; option domain-name "${cfg.domain}";
option domain-search "${ option domain-search "${
concatStringsSep " " ([ cfg.domain ] ++ cfg.search-domains) concatStringsSep " " ([ cfg.domain ] ++ cfg.search-domains)
}"; }";
range ${pkgs.lib.fudo.ip.networkMinIp cfg.dhcp-dynamic-network} ${ range ${pkgs.lib.ip.networkMinIp cfg.dhcp-dynamic-network} ${
pkgs.lib.fudo.ip.networkMaxButOneIp cfg.dhcp-dynamic-network pkgs.lib.ip.networkMaxButOneIp cfg.dhcp-dynamic-network
}; };
} }
''; '';
@ -230,7 +230,7 @@ in {
${join-lines (mapAttrsToList hostSshFpRecords zone.hosts)} ${join-lines (mapAttrsToList hostSshFpRecords zone.hosts)}
${join-lines (mapAttrsToList cnameRecord zone.aliases)} ${join-lines (mapAttrsToList cnameRecord zone.aliases)}
${join-lines zone.verbatim-dns-records} ${join-lines zone.verbatim-dns-records}
${pkgs.lib.fudo.dns.srvRecordsToBindZone zone.srv-records} ${pkgs.lib.dns.srvRecordsToBindZone zone.srv-records}
${join-lines cfg.extra-records} ${join-lines cfg.extra-records}
''; '';
}] ++ blockZones; }] ++ blockZones;