makefu/stockholm
1
0
Fork 0
Code Issues Pull requests Actions1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'gum/master'

Browse source
This commit is contained in:
lassulus 2019-06-15 01:06:42 +02:00
parent cb7fcd8efa eda35fc0a6
commit 71ce7ab952
1 changed files with 15 additions and 7 deletions

22
krebs/3modules/makefu/default.nix
View file

@ -143,11 +143,19 @@ in {
ci = true; ci = true;
cores = 4; cores = 4;
nets = { nets = {
lan = {
ip4.addr = "192.168.8.11";
aliases = [
"wbob.lan"
"log.wbob.lan"
];
};
retiolum = { retiolum = {
ip4.addr = "10.243.214.15"; ip4.addr = "10.243.214.15";
aliases = [ aliases = [
"wbob.r" "wbob.r"
"hydra.wbob.r" "hydra.wbob.r"
"log.wbob.r"
]; ];
}; };
}; };
@ -182,6 +190,7 @@ in {
wiki.euer IN A ${nets.internet.ip4.addr} wiki.euer IN A ${nets.internet.ip4.addr}
wikisearch IN A ${nets.internet.ip4.addr} wikisearch IN A ${nets.internet.ip4.addr}
io IN NS gum.krebsco.de. io IN NS gum.krebsco.de.
mediengewitter IN CNAME over.dose.io.
''; '';
}; };
cores = 8; cores = 8;
@ -196,13 +205,9 @@ in {
}; };
wiregrill = { wiregrill = {
via = internet; via = internet;
ip4.addr = "10.245.0.1";
ip6.addr = w6 "1"; ip6.addr = w6 "1";
wireguard = { wireguard.port = 51821;
subnets = [
(krebs.genipv6 "wiregrill" "external" 0).subnetCIDR
(krebs.genipv6 "wiregrill" "makefu" 0).subnetCIDR
];
};
}; };
retiolum = { retiolum = {
via = internet; via = internet;
@ -247,7 +252,6 @@ in {
cores = 1; cores = 1;
extraZones = { extraZones = {
"krebsco.de" = '' "krebsco.de" = ''
mediengewitter IN A ${nets.internet.ip4.addr}
flap IN A ${nets.internet.ip4.addr} flap IN A ${nets.internet.ip4.addr}
''; '';
}; };
@ -281,6 +285,10 @@ in {
}; };
}; };
}; };
rockit = rec { # router@home
cores = 1;
nets.wiregrill.ip4.addr = "10.245.0.2";
};
senderechner = rec { senderechner = rec {
cores = 2; cores = 2;