diff options
| author | jeschli <jeschli@gmail.com> | 2019-06-25 22:43:02 +0200 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2019-06-25 22:43:02 +0200 |
| commit | 1cfc265bbfa14b7d9fc6479bcd9cf541e7cdd5eb (patch) | |
| tree | 18b95faba964f8072d23afcadcadda4f3eb276af /krebs/3modules/makefu/default.nix | |
| parent | 8079877eee34d0a658e8419adfa8987e648388a8 (diff) | |
| parent | 1d23dceb5d2c536790a00fcde30743b958f1018f (diff) | |
Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'krebs/3modules/makefu/default.nix')
| -rw-r--r-- | krebs/3modules/makefu/default.nix | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index b38c9104f..601762b93 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -143,11 +143,19 @@ in { ci = true; cores = 4; nets = { + lan = { + ip4.addr = "192.168.8.11"; + aliases = [ + "wbob.lan" + "log.wbob.lan" + ]; + }; retiolum = { ip4.addr = "10.243.214.15"; aliases = [ "wbob.r" "hydra.wbob.r" + "log.wbob.r" ]; }; }; @@ -182,6 +190,7 @@ in { wiki.euer IN A ${nets.internet.ip4.addr} wikisearch IN A ${nets.internet.ip4.addr} io IN NS gum.krebsco.de. + mediengewitter IN CNAME over.dose.io. ''; }; cores = 8; @@ -196,13 +205,13 @@ in { }; wiregrill = { via = internet; + ip4.addr = "10.244.245.1"; ip6.addr = w6 "1"; - wireguard = { - subnets = [ - (krebs.genipv6 "wiregrill" "external" 0).subnetCIDR + wireguard.port = 51821; + wireguard.subnets = [ (krebs.genipv6 "wiregrill" "makefu" 0).subnetCIDR - ]; - }; + "10.244.245.0/24" # required for routing directly to gum via rockit + ]; }; retiolum = { via = internet; @@ -247,7 +256,6 @@ in { cores = 1; extraZones = { "krebsco.de" = '' - mediengewitter IN A ${nets.internet.ip4.addr} flap IN A ${nets.internet.ip4.addr} ''; }; @@ -281,6 +289,10 @@ in { }; }; }; + rockit = rec { # router@home + cores = 1; + nets.wiregrill.ip4.addr = "10.244.245.2"; + }; senderechner = rec { cores = 2; |