summaryrefslogtreecommitdiffstats
path: root/krebs/3modules/tv/default.nix
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-11-10 23:50:34 +0100
committertv <tv@krebsco.de>2016-11-10 23:50:34 +0100
commitf458fd8be96e39b2ba6cf15f0ee48b38f294044c (patch)
treedcb066f8482134bcc8cdb81d13c5f9798b0b5ff4 /krebs/3modules/tv/default.nix
parent2adac450ac1f613acd81069895448623a4c8937b (diff)
cd: drop stuff now done by ni
Diffstat (limited to 'krebs/3modules/tv/default.nix')
-rw-r--r--krebs/3modules/tv/default.nix10
1 files changed, 2 insertions, 8 deletions
diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix
index ca8e577d8..8e266e1b3 100644
--- a/krebs/3modules/tv/default.nix
+++ b/krebs/3modules/tv/default.nix
@@ -78,11 +78,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
- mx23 60 IN A ${config.krebs.hosts.cd.nets.internet.ip4.addr}
cd 60 IN A ${config.krebs.hosts.cd.nets.internet.ip4.addr}
- cgit 60 IN A ${config.krebs.hosts.cd.nets.internet.ip4.addr}
- cgit.cd 60 IN A ${config.krebs.hosts.cd.nets.internet.ip4.addr}
'';
};
nets = {
@@ -90,11 +86,7 @@ with import <stockholm/lib>;
ip4.addr = "45.62.237.203";
aliases = [
"cd.i"
- "cd.internet"
"cd.krebsco.de"
- "cgit.cd.krebsco.de"
- "cd.viljetic.de"
- "cgit.cd.viljetic.de"
];
ssh.port = 11423;
};
@@ -221,7 +213,9 @@ with import <stockholm/lib>;
ni = {
extraZones = {
"krebsco.de" = ''
+ krebsco.de. 60 IN MX 5 ni
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}
'';
};