summaryrefslogtreecommitdiffstats
path: root/krebs/3modules/tv
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-11-25 00:19:17 +0100
committerlassulus <lass@aidsballs.de>2016-11-25 00:19:17 +0100
commit8014aa6594a6bb442a950abed67dd13543d34d88 (patch)
tree101817d3948442b5294f1f23543a7ac9df9f0ddd /krebs/3modules/tv
parent2ea9b739ac64773de0a490736d6e1bdf556c6b60 (diff)
parentb3c6e9a2bde5d1c911d1bb17ca3218acab7285b8 (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'krebs/3modules/tv')
-rw-r--r--krebs/3modules/tv/default.nix11
1 files changed, 9 insertions, 2 deletions
diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix
index 8e266e1b3..3315dd157 100644
--- a/krebs/3modules/tv/default.nix
+++ b/krebs/3modules/tv/default.nix
@@ -78,7 +78,9 @@ 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 = {
@@ -213,7 +215,6 @@ 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}
@@ -351,11 +352,17 @@ with import <stockholm/lib>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIcJvu8JDVzObLUtlAQg9qVugthKSfitwCljuJ5liyHa";
};
xu = {
+ binary-cache = {
+ pubkey = "xu-1:pYRENvaxZqGeImwLA9qHmRwHV4jfKaYx4u1VcZ31x0s=";
+ };
cores = 4;
nets = {
gg23 = {
ip4.addr = "10.23.1.38";
- aliases = ["xu.gg23"];
+ aliases = [
+ "cache.xu.gg23"
+ "xu.gg23"
+ ];
ssh.port = 11423;
};
retiolum = {