feat: no need for the extra config

This commit is contained in:
silver 2024-03-11 23:47:21 +00:00
parent 752194eb61
commit 97e18e5514

View file

@ -197,10 +197,15 @@
then create_entry_etc_sub domain (text.old domain) then create_entry_etc_sub domain (text.old domain)
else {}; else {};
create_entry_zone = domain: extraConfig: { create_entry_zone = domain: {
"${domain}" = { "${domain}" = {
extraConfig = '' extraConfig = ''
${extraConfig} allow-update {
key rfc2136key.${domain}.;
};
dnssec-policy default;
inline-signing yes;
// for bumping the config // for bumping the config
// ${current_date} // ${current_date}
''; '';
@ -221,23 +226,6 @@
old = domain: get_config_file_old_domains domain; old = domain: get_config_file_old_domains domain;
}; };
extraConfig = {
owned =
if cfg.server.primary
then ''
allow-update { key rfc2136key.skynet.ie.; };
dnssec-policy default;
inline-signing yes;
''
else "";
# no extra config for reverse
reverse = "";
old = "";
};
records = records =
config.skynet.records."skynet.ie" config.skynet.records."skynet.ie"
++ builtins.concatLists ( ++ builtins.concatLists (
@ -333,12 +321,12 @@ in {
]; ];
services.bind.zones = services.bind.zones =
(create_entry_zone "csn.ul.ie" extraConfig.owned) (create_entry_zone "csn.ul.ie")
// (create_entry_zone "skynet.ie" extraConfig.owned) // (create_entry_zone "skynet.ie" )
// (create_entry_zone "ulcompsoc.ie" extraConfig.owned) // (create_entry_zone "ulcompsoc.ie" )
// (create_entry_zone "64-64.99.1.193.in-addr.arpa" extraConfig.reverse) // (create_entry_zone "64-64.99.1.193.in-addr.arpa" )
// (create_entry_zone "conradcollins.net" extraConfig.old) // (create_entry_zone "conradcollins.net" )
// (create_entry_zone "edelharty.net" extraConfig.old); // (create_entry_zone "edelharty.net" );
environment.etc = environment.etc =
(create_entry_etc "csn.ul.ie" "owned") (create_entry_etc "csn.ul.ie" "owned")