diff options
author | lassulus <lassulus@lassul.us> | 2019-06-15 02:09:37 +0200 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2019-06-15 02:09:37 +0200 |
commit | 14954b9632870e216530a035bf648c6be086844f (patch) | |
tree | a16d3595acfa39a36d401614741f47bfbc3484a6 | |
parent | 71ce7ab95294db7b26467ad5776c5a460125d4b1 (diff) | |
parent | cdd1c018ec4a0022cc5d8ddf3ad355952131e8a2 (diff) |
Merge remote-tracking branch 'gum/master'
-rw-r--r-- | krebs/3modules/makefu/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index dc9ade199..601762b93 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -205,9 +205,13 @@ in { }; wiregrill = { via = internet; - ip4.addr = "10.245.0.1"; + ip4.addr = "10.244.245.1"; ip6.addr = w6 "1"; 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; @@ -287,7 +291,7 @@ in { }; rockit = rec { # router@home cores = 1; - nets.wiregrill.ip4.addr = "10.245.0.2"; + nets.wiregrill.ip4.addr = "10.244.245.2"; }; senderechner = rec { |