diff options
| author | lassulus <git@lassul.us> | 2023-09-04 10:56:33 +0200 |
|---|---|---|
| committer | lassulus <git@lassul.us> | 2023-09-04 10:56:33 +0200 |
| commit | df62e24584a38d680018bfcab18821d12b0b1d13 (patch) | |
| tree | 84906536fcdaf4857ed6b491dd50aad15106ea70 /kartei | |
| parent | 591680e58f94e2fc6a65378c0baf190c2f2a5b68 (diff) | |
| parent | da3c1f05f595ac6919f26e994094d5513936a06e (diff) | |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'kartei')
| -rw-r--r-- | kartei/feliks/default.nix | 5 | ||||
| -rw-r--r-- | kartei/krebs/default.nix | 9 |
2 files changed, 12 insertions, 2 deletions
diff --git a/kartei/feliks/default.nix b/kartei/feliks/default.nix index a124d52d8..9f9866c71 100644 --- a/kartei/feliks/default.nix +++ b/kartei/feliks/default.nix @@ -93,7 +93,10 @@ in { ahuatangata = { nets.wiregrill = { ip4.addr = "10.244.10.246"; - aliases = [ "ahuatangata" "ndrd.feliks.r" ]; + aliases = [ + "ahuatangata.w" + "ndrd.feliks.w" + ]; wireguard.pubkey = "QPDGBEYJ1znqUdjy6JWZJ+cqPMcU67dHlOX5beTM6TA="; }; }; diff --git a/kartei/krebs/default.nix b/kartei/krebs/default.nix index e48b3e32a..bbf6a74f8 100644 --- a/kartei/krebs/default.nix +++ b/kartei/krebs/default.nix @@ -165,7 +165,8 @@ in { owner = config.krebs.users.krebs; extraZones = { "krebsco.de" = /* bindzone */ '' - krebsco.de. 60 IN A ${config.krebs.hosts.ponte.nets.internet.ip4.addr} + @ IN A ${config.krebs.hosts.ponte.nets.internet.ip4.addr} + ns1 IN A ${config.krebs.hosts.ponte.nets.internet.ip4.addr} ''; }; nets = rec { @@ -178,6 +179,12 @@ in { "ponte.i" ]; }; + intranet = { + ip4 = rec { + addr = "10.0.0.234"; + prefix = "${addr}/24"; + }; + }; retiolum = { via = internet; ip4.addr = "10.243.4.43"; |