summaryrefslogtreecommitdiffstats
path: root/krebs/3modules/makefu
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-04-12 09:24:46 +0200
committertv <tv@krebsco.de>2017-04-12 09:24:46 +0200
commit0248fce6be6705de4a6beab0f2a9336550df9d18 (patch)
tree6865e194d5df1f9f77a03da06192d5034f97cacf /krebs/3modules/makefu
parent75f43655d379a7aeed58b9cb423759b8a3696a9a (diff)
parent9224e9c4c8432ce8d7788592b9d25cfc29440ee6 (diff)
Merge remote-tracking branch 'prism/makefu'
Diffstat (limited to 'krebs/3modules/makefu')
-rw-r--r--krebs/3modules/makefu/default.nix25
1 files changed, 13 insertions, 12 deletions
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix
index 489f62b65..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 {
@@ -464,7 +459,7 @@ with import <stockholm/lib>;
retiolum = {
via = internet;
ip4.addr = "10.243.0.211";
- ip6.addr = "42:f9f0:0000:0000:0000:0000:0000:70d2";
+ # ip6.addr = "42:f9f0:0000:0000:0000:0000:0000:70d2";
aliases = [
"gum.r"
"gum.retiolum"
@@ -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-----