diff options
| author | lassulus <lassulus@lassul.us> | 2020-09-27 15:13:20 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2020-09-27 15:13:20 +0200 |
| commit | 0cd3e8771b01774bcfda000634395c10d1410d89 (patch) | |
| tree | 1f6f02811a4ef93be4cf3cad46bde23d654653ae | |
| parent | a24fec6855977969f96a1d50cea4f68c6540f6d5 (diff) | |
l: use ipv4 addresses for wiregrill
| -rw-r--r-- | krebs/3modules/lass/default.nix | 4 | ||||
| -rw-r--r-- | lass/1systems/prism/config.nix | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index 2a75cc1bb..d2a945284 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -95,6 +95,7 @@ in { }; wiregrill = { via = internet; + ip4.addr = "10.244.1.103"; ip6.addr = w6 "1"; aliases = [ "prism.w" @@ -104,6 +105,7 @@ in { subnets = [ (krebs.genipv6 "wiregrill" "external" 0).subnetCIDR (krebs.genipv6 "wiregrill" "lass" 0).subnetCIDR + "10.244.1.0/24" ]; }; }; @@ -196,6 +198,7 @@ in { }; wiregrill = { ip6.addr = w6 "50da"; + ip4.addr = "10.244.1.4"; aliases = [ "shodan.w" ]; @@ -554,6 +557,7 @@ in { phone = { nets = { wiregrill = { + ip4.addr = "10.244.1.13"; ip6.addr = w6 "a"; aliases = [ "phone.w" diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index 33ec21e72..42d07f36a 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -272,9 +272,9 @@ with import <stockholm/lib>; resolveLocalQueries = false; extraConfig= '' - listen-address=42:1:ce16::1 + listen-address=42:1:ce16::1,10.244.1.103 except-interface=lo - interface=wg0 + interface=wiregrill ''; }; } |