summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2017-04-11 21:50:29 +0200
committerlassulus <lass@lassul.us>2017-04-11 21:50:29 +0200
commit1f317b8a1a38e41cb721835ed46b2db1a5318f23 (patch)
tree5f4a6a791c4278a0709362d82ded9b7235d28112 /krebs
parent575a37f00e0ee6866c72a99327921068222fc1b0 (diff)
parent9224e9c4c8432ce8d7788592b9d25cfc29440ee6 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'krebs')
-rw-r--r--krebs/3modules/makefu/default.nix23
1 files changed, 12 insertions, 11 deletions
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix
index 7a6a88e85..8e5927f9d 100644
--- a/krebs/3modules/makefu/default.nix
+++ b/krebs/3modules/makefu/default.nix
@@ -285,12 +285,9 @@ with import <stockholm/lib>;
cores = 1;
extraZones = {
"krebsco.de" = ''
- euer IN A ${nets.internet.ip4.addr}
- wiki.euer IN A ${nets.internet.ip4.addr}
- wry IN A ${nets.internet.ip4.addr}
- io IN NS wry.krebsco.de.
- graphs IN A ${nets.internet.ip4.addr}
- tinc IN A ${nets.internet.ip4.addr}
+ wry IN A ${nets.internet.ip4.addr}
+ io IN NS wry.krebsco.de.
+ tinc IN A ${nets.internet.ip4.addr}
'';
};
nets = rec {
@@ -307,13 +304,8 @@ with import <stockholm/lib>;
ip6.addr = "42:6e1e:cc8a:7cef:827:f938:8c64:baad";
aliases = [
"graphs.wry.retiolum"
- "graphs.r" "graphs.retiolum"
"paste.wry.retiolum"
"wry.r" "wry.retiolum"
- "wiki.makefu.retiolum"
- "wiki.wry.retiolum"
- "blog.makefu.retiolum"
- "blog.wry.retiolum"
];
tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY-----
@@ -452,6 +444,9 @@ with import <stockholm/lib>;
cgit.euer IN A ${nets.internet.ip4.addr}
o.euer IN A ${nets.internet.ip4.addr}
dl.euer IN A ${nets.internet.ip4.addr}
+ euer IN A ${nets.internet.ip4.addr}
+ wiki.euer IN A ${nets.internet.ip4.addr}
+ graphs IN A ${nets.internet.ip4.addr}
'';
};
nets = rec {
@@ -473,6 +468,12 @@ with import <stockholm/lib>;
"o.gum.retiolum"
"tracker.makefu.r"
"tracker.makefu.retiolum"
+
+ "graphs.r" "graphs.retiolum"
+ "wiki.makefu.retiolum"
+ "wiki.wry.retiolum"
+ "blog.makefu.retiolum"
+ "blog.wry.retiolum"
];
tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY-----