From 44afefbfb7fe604c2e37417503a6418aaa514937 Mon Sep 17 00:00:00 2001 From: feliks Date: Mon, 14 Aug 2023 00:02:19 +0200 Subject: kartei feliks: update papawhakaaro's keys --- kartei/feliks/default.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'kartei') diff --git a/kartei/feliks/default.nix b/kartei/feliks/default.nix index 96c20f602..a124d52d8 100644 --- a/kartei/feliks/default.nix +++ b/kartei/feliks/default.nix @@ -25,20 +25,20 @@ in { aliases = [ "papawhakaaro.r" "tp.feliks.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- - MIICCgKCAgEA4bd0lVUVlzFmM8TuH77C5VctcK4lkw02LbMVQDJ5U+Ww075nNahw - oRHqPgJRwfGW0Tgu/1s5czZ2tAFU3lXoOSBYldAspM3KRZ4DKQsFrL9B0oWarGsK - sUgsuOJprlX4mkfj/eBNINqTqf2kVIH+p43VENQ9ioKmc+qJKm4xfRONRLp871GV - 5jmIvRvQ6JP0RtNd2KpNLaeplzx8M61D9PBOAZkNYAUTpBs4LZBNJj4eFnXBugrz - GkBjmm3Rk7olz0uOZzbeTc6Slv2tgtN5FrQifdy4XIlsKcBTzMkYHEZstmldJgd9 - pGvfmem6uPcXrF+eDJzqUn0ArH7eOIS4F0+DzugJz4qX+ytvE4ag7r2Vx0Pa9TCY - hpn0lqwW+ly1clM0SKt59v1nQ4oRW4UIbAZaIgp4UJbb3IGSwbq7NuadvHpNICHi - 4pqQD+1sSEbGLAZ0bFjLIYFg9zzNjLeAxXpn49WHOEyRlq3h+SUQcG2EuVMI28DX - lILKSoOJsuQupURPubaxkiNEa5neYk9hZ8CWgwSG/VlyRLuNsVDVn2dBma43Mr10 - LHMkX2/a9t7ghokugvV2XMP9Es9A9TGFShM9UtFAlovdad+SQ8FBPNheDwIhjCJe - l5NIrMrmQIveq7QJ1szxYhqfl1ifU0c+YxeMkg3tvEuQV/tk/oki/aECAwEAAQ== + MIICCgKCAgEApPx0Xa5tms6t9yOqrdBuz5JVheIqntIF4XK04gXMYr/lcqWj35Sj + jM0fObbB0MXz1Di0DsWT5ukVMpvRfespif2FsRfpUOBzVQymlcFfn7D4t2qUa0nH + AHuvoSqb2qV8YUIvVRNdnNSv1NWlbEpcsKXzg36O2ESdro64vSM5hAVw8Djo8Eoh + AGlZVi1tplVs+DPlsMjUqjCrGeq81V7SiLwaVc7adcx/cNvzDA23axkUosm/X2fN + Ug8UWXHt3SgH/BtTwWIpT48anIdPbkttH0d4ICzt0g3nX6+zmVhdzIjHWNsmjxaQ + qKn2DfC1TcYffE4k4E2yENwLoTkJn3U3cCowt7OTLfNvexRyFj5E/O1Aa1VdwX68 + MTpF89Hv8SKUSMRsbyG/vFAoh/I88Y4lDis+TtBKPs1VLBtsQy1mZaIooSTslPf+ + pcUDBBUsf2/SudwvbBC1XHl1YDnRFBZG74ApVIXeIo5G8Cfm4LasppYqPJ7YzTKp + 6yoR9iKaXONTwQ3xhlBcfpMxObZTE1v8kF9sy3t9Pl8Px9f4PSbuQpp82MJrRJQC + FYTMkUh0PZwbw7vzqDLjeW715YWeNKW6PSFT0TtY8UTNNKFslhUfuBBLGyjsU+T3 + 9m9uNNhRxFoFmlKYziFzyEVWgMl67Eg0CQAulP0q9zv3d4367il6SK8CAwEAAQ== -----END RSA PUBLIC KEY----- ''; - tinc.pubkey_ed25519 = "5G49yQPjkkoGZxM6CeDy87y6tB/abtelUAk55wJ4GpP"; + tinc.pubkey_ed25519 = "8g19LVFwgtdpFPcqTM/pdCzWhy3ins9+LPjHIjwNFvA"; }; }; }; -- 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