From d3ace17ebd02624fcf38c3c0b0e0f4fb08f4beb6 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 1 Aug 2023 17:20:51 +0200 Subject: kartei ponte: assign ns1.krebsco.de --- kartei/krebs/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'kartei') diff --git a/kartei/krebs/default.nix b/kartei/krebs/default.nix index e48b3e32a..6c4ac8e80 100644 --- a/kartei/krebs/default.nix +++ b/kartei/krebs/default.nix @@ -166,6 +166,7 @@ in { extraZones = { "krebsco.de" = /* bindzone */ '' krebsco.de. 60 IN A ${config.krebs.hosts.ponte.nets.internet.ip4.addr} + ns1 IN A ${config.krebs.hosts.ponte.nets.internet.ip4.addr} ''; }; nets = rec { -- cgit v1.2.3 From dc6575069609f0065c5ec3bd186a41fc0d1e9631 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 1 Aug 2023 17:22:00 +0200 Subject: kartei ponte: simplify krebsco.de record --- kartei/krebs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kartei') diff --git a/kartei/krebs/default.nix b/kartei/krebs/default.nix index 6c4ac8e80..0525b4c85 100644 --- a/kartei/krebs/default.nix +++ b/kartei/krebs/default.nix @@ -165,7 +165,7 @@ 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} ''; }; -- cgit v1.2.3 From 3a86105cef21b0397ba399ab44b2290f743f22d1 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 1 Aug 2023 17:22:16 +0200 Subject: kartei ponte: add intranet --- kartei/krebs/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'kartei') diff --git a/kartei/krebs/default.nix b/kartei/krebs/default.nix index 0525b4c85..bbf6a74f8 100644 --- a/kartei/krebs/default.nix +++ b/kartei/krebs/default.nix @@ -179,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"; -- cgit v1.2.3 From 6bd5f06770f0b16ae6ec6fd906402883bd6e75b6 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Aug 2023 12:37:18 +0200 Subject: kartei feliks: fix ahuatangata's aliases --- kartei/feliks/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'kartei') diff --git a/kartei/feliks/default.nix b/kartei/feliks/default.nix index 96c20f602..953f1a7ee 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="; }; }; -- cgit v1.2.3 From aa0292417f18840f61a504b752e4b3f4172fee97 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 4 Sep 2023 20:23:12 +0200 Subject: kartei janik: make pure --- kartei/janik/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'kartei') diff --git a/kartei/janik/default.nix b/kartei/janik/default.nix index 44ec9b0a8..a945550d1 100644 --- a/kartei/janik/default.nix +++ b/kartei/janik/default.nix @@ -1,12 +1,12 @@ -with import ../../lib; -{ config, ... }: let - hostDefaults = hostName: host: flip recursiveUpdate host ({ +{ config, lib, ... }: let + slib = import ../../lib/pure.nix { inherit lib; }; + hostDefaults = hostName: host: lib.flip lib.recursiveUpdate host ({ ci = false; external = true; monitoring = false; - } // optionalAttrs (host.nets?retiolum) { + } // lib.optionalAttrs (host.nets?retiolum) { nets.retiolum.ip6.addr = - (krebs.genipv6 "retiolum" "external" { inherit hostName; }).address; + (slib.krebs.genipv6 "retiolum" "external" { inherit hostName; }).address; }); in { users.janik = { @@ -16,7 +16,7 @@ in { owner = config.krebs.users.janik; nets.retiolum = { aliases = [ "hertz.janik.r" ]; - ip6.addr = (lib.krebs.genipv6 "retiolum" "janik" { hostName = "hertz"; }).address; + ip6.addr = (slib.krebs.genipv6 "retiolum" "janik" { hostName = "hertz"; }).address; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- MIICCgKCAgEA0mqxrdVU9wFhNZYGWEknJpKV4yIodNlaCIKDPVhU5wmlzh2szKUS -- cgit v1.2.3 From 1e89787cbafbe4dcd2b4da947d6ac2d14824875c Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 7 Sep 2023 12:05:42 +0200 Subject: kartei lass: remove privkeys --- kartei/lass/default.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'kartei') diff --git a/kartei/lass/default.nix b/kartei/lass/default.nix index d4806534f..9ccf1c72d 100644 --- a/kartei/lass/default.nix +++ b/kartei/lass/default.nix @@ -19,7 +19,6 @@ in { consul = true; ci = true; monitoring = true; - ssh.privkey.path = ; }) ( lib.genAttrs hostFiles (host: import (./. + "/${host}.nix") { inherit config lib r6 w6; -- cgit v1.2.3 From f55307fd73af235069744dd5155fda0bc73fe613 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 7 Sep 2023 12:26:31 +0200 Subject: lass: migrate away --- kartei/lass/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kartei') diff --git a/kartei/lass/default.nix b/kartei/lass/default.nix index 9ccf1c72d..fac48a8ba 100644 --- a/kartei/lass/default.nix +++ b/kartei/lass/default.nix @@ -17,7 +17,7 @@ in { hosts = lib.mapAttrs (_: lib.recursiveUpdate { owner = config.krebs.users.lass; consul = true; - ci = true; + ci = false; monitoring = true; }) ( lib.genAttrs hostFiles (host: import (./. + "/${host}.nix") { -- cgit v1.2.3