summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2017-06-06 14:31:53 +0200
committerlassulus <lass@lassul.us>2017-06-06 14:31:53 +0200
commit6d96297a9d6bcddc8b545585d9e4180e493b899f (patch)
treef2652c987a396238c257b637d8b8422e03aa9072 /krebs
parent1ebd26d96de5714f35f31fcefc89cbb414c21093 (diff)
parentd18eb5ccd1ec6cc0b7797ac72d8bb258689a544b (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'krebs')
-rw-r--r--krebs/3modules/tv/default.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix
index 0db686005..6e5f522dc 100644
--- a/krebs/3modules/tv/default.nix
+++ b/krebs/3modules/tv/default.nix
@@ -77,9 +77,7 @@ with import <stockholm/lib>;
extraZones = {
# TODO generate krebsco.de zone from nets and don't use extraZones at all
"krebsco.de" = ''
- krebsco.de. 60 IN MX 5 mx23
cd 60 IN A ${config.krebs.hosts.cd.nets.internet.ip4.addr}
- mx23 60 IN A ${config.krebs.hosts.cd.nets.internet.ip4.addr}
'';
};
nets = {
@@ -212,6 +210,7 @@ with import <stockholm/lib>;
ni 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr}
cgit 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr}
cgit.ni 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr}
+ krebsco.de. 60 IN MX 5 ni
'';
};
nets = {