summaryrefslogtreecommitdiffstats
path: root/kartei/tv/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'kartei/tv/default.nix')
-rw-r--r--kartei/tv/default.nix18
1 files changed, 6 insertions, 12 deletions
diff --git a/kartei/tv/default.nix b/kartei/tv/default.nix
index e6cfedb02..005c26e88 100644
--- a/kartei/tv/default.nix
+++ b/kartei/tv/default.nix
@@ -40,7 +40,6 @@ in {
hosts = mapAttrs evalHost {
alnus = {
ci = true;
- cores = 2;
nets = {
retiolum = {
ip4.addr = "10.243.21.1";
@@ -64,7 +63,6 @@ in {
};
au = {
ci = true;
- cores = 4;
nets = {
retiolum = {
ip4.addr = "10.243.13.39";
@@ -89,7 +87,6 @@ in {
};
bu = {
ci = true;
- cores = 4;
nets = {
retiolum = {
ip4.addr = "10.243.13.36";
@@ -138,7 +135,6 @@ in {
};
mu = {
ci = true;
- cores = 2;
nets = {
retiolum = {
ip4.addr = "10.243.20.1";
@@ -169,8 +165,10 @@ in {
cgit 60 IN AAAA ${config.krebs.hosts.ni.nets.internet.ip6.addr}
cgit.ni 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr}
cgit.ni 60 IN AAAA ${config.krebs.hosts.ni.nets.internet.ip6.addr}
+ search.ni 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr}
+ search.ni 60 IN AAAA ${config.krebs.hosts.ni.nets.internet.ip6.addr}
krebsco.de. 60 IN MX 5 ni
- krebsco.de. 60 IN TXT v=spf1 mx -all
+ krebsco.de. 60 IN TXT "v=spf1 mx -all"
tv 300 IN NS ni
'';
};
@@ -196,6 +194,8 @@ in {
aliases = [
"ni.r"
"cgit.ni.r"
+ "krebs.ni.r"
+ "search.ni.r"
];
tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY-----
@@ -226,7 +226,6 @@ in {
};
nomic = {
ci = true;
- cores = 2;
nets = {
retiolum = {
ip4.addr = "10.243.0.110";
@@ -252,7 +251,6 @@ in {
};
wu = {
ci = true;
- cores = 4;
nets = {
retiolum = {
ip4.addr = "10.243.13.37";
@@ -278,7 +276,6 @@ in {
};
querel = {
ci = true;
- cores = 2;
nets = {
retiolum = {
ip4.addr = "10.243.22.22";
@@ -309,14 +306,12 @@ in {
pubkey = "xu-1:pYRENvaxZqGeImwLA9qHmRwHV4jfKaYx4u1VcZ31x0s=";
};
ci = true;
- cores = 4;
nets = {
retiolum = {
ip4.addr = "10.243.13.38";
aliases = [
"xu.r"
"cgit.xu.r"
- "krebs.xu.r"
];
tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY-----
@@ -336,7 +331,6 @@ in {
};
zu = {
ci = true;
- cores = 4;
nets = {
retiolum = {
ip4.addr = "10.243.13.40";
@@ -366,7 +360,7 @@ in {
"http://cgit.krebsco.de" = {
desc = "Git repositories";
};
- "http://krebs.xu.r" = {
+ "http://krebs.ni.r" = {
desc = "krebs-pages mirror";
};
};