From 4d7aacdd1c2a8cc9f6d826cb7e3bb2bc10e36a5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 24 Sep 2022 13:27:29 +0200 Subject: mic92: add stable-confusion.r --- krebs/3modules/external/mic92.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'krebs/3modules') diff --git a/krebs/3modules/external/mic92.nix b/krebs/3modules/external/mic92.nix index e89b8c7fb..6a4d2b371 100644 --- a/krebs/3modules/external/mic92.nix +++ b/krebs/3modules/external/mic92.nix @@ -891,7 +891,10 @@ in { }; retiolum = { via = internet; - aliases = [ "jack.r" ]; + aliases = [ + "jack.r" + "stable-confusion.r" + ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAx5ROeRs0CxD2IPfkrFB4O03/Kf8Ajjmd/J1gpCvHROKL+gDvaCO1 -- cgit v1.2.3 From a840d7b1f793fe91b143c1b453a41db48ed404d9 Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Tue, 27 Sep 2022 10:18:48 +0200 Subject: external: add porree --- krebs/3modules/external/default.nix | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'krebs/3modules') diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix index 8ddd565d6..62e638730 100644 --- a/krebs/3modules/external/default.nix +++ b/krebs/3modules/external/default.nix @@ -112,6 +112,33 @@ in { }; }; }; + + porree = { + owner = config.krebs.users.pinpox; + nets = { + retiolum = { + ip4.addr = "10.243.100.101"; + aliases = [ "porree.r" ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIICCgKCAgEAvUeG5/8O8ZyDulpvdKNcA20aZIUv3YdUe9XJ0lNUgMCg6YdWTmba + 03wfm/SPoUM4ZOb6/QyEmdNWxQbeKVPZ8cNs/uDLMmpEoSaSKWsp7ZqtrxxincUY + AGhyrU0h59lIZXZtmIp1Uc3Y7GYdX9MM2RsOs+0dYwCzZlHjarmNjxLRBcEbugMR + +86zrwtcLGKBmMMhRbMQ/y07zwxb5wFSF7nSgFD0yzFjmaBLU6mYtzRR0hb17n34 + xmB7Lpj7ROtbB20btTmdyXHuE8P+5mohJavqAnpKiLNFLt9tNk1Vc4qAxlDkubZW + SoHuPNyE/563jooL1DHDQ2EZ4lDweTYlT0gAOYGCcNVoCFCs/rbFK4u2p5FCVAfE + bhc0Fm3fKNk6An1wIsSEg7UcYeTbaFBHbqr+7TiLyS2aehkgy4FF4n6ACDeF9cHM + 80OHh+N1wz7uL7BHcniTws7VWyloPOoEUJlZEDzHF/p1nfpDULsqNM0o8QGNmOeT + 4J2Sp+jJLin/8g2tPH+zMSge5rnFlPuBaRVZ5dwajdyq3USNgtVH1lZFx8sTLsAC + JEW9Jn3xPDCaLGWp2fFzsg0hPxOG0SYD75coZcfikJ6MedvHFHAmf9KBYJxFWcXa + JGky/WwdAF2f34e2vk/mWrjfgBIDzXU01Opm99lgWuMr5HMkCzH1kssCAwEAAQ== + -----END RSA PUBLIC KEY----- + ''; + tinc.pubkey_ed25519 = "pXVWAPo/1JWhRs/0ip4Hz0bOSHTJa7FfaI74elU8XsL"; + }; + }; + }; + qubasa = { owner = config.krebs.users.qubasa; nets = { -- cgit v1.2.3 From c3bc2f79d55653051bf8ec6c4f8d68046de77c3d Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 27 Sep 2022 12:24:05 +0200 Subject: k: inotifyTools -> inotify-tools --- krebs/3modules/permown.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs/3modules') diff --git a/krebs/3modules/permown.nix b/krebs/3modules/permown.nix index ca81e2ea5..a4dd40386 100644 --- a/krebs/3modules/permown.nix +++ b/krebs/3modules/permown.nix @@ -69,7 +69,7 @@ with import ; path = [ pkgs.coreutils pkgs.findutils - pkgs.inotifyTools + pkgs.inotify-tools ]; serviceConfig = { ExecStart = pkgs.writeDash "permown" '' -- cgit v1.2.3 From e2285620bbd4e0b291997a7da66cfcf026c4e234 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 27 Sep 2022 12:26:37 +0200 Subject: k: utillinux -> util-linux --- krebs/3modules/backup.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs/3modules') diff --git a/krebs/3modules/backup.nix b/krebs/3modules/backup.nix index 4a88582a2..c1d4d7211 100644 --- a/krebs/3modules/backup.nix +++ b/krebs/3modules/backup.nix @@ -82,7 +82,7 @@ let gnused openssh rsync - utillinux + util-linux ]; restartIfChanged = false; serviceConfig = rec { -- cgit v1.2.3 From a5146855c4a4d7520372035d0598eb5d04b6b588 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 27 Sep 2022 12:28:15 +0200 Subject: k: iproute -> iproute2 --- krebs/3modules/tinc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs/3modules') diff --git a/krebs/3modules/tinc.nix b/krebs/3modules/tinc.nix index 38e310908..c33b30f0d 100644 --- a/krebs/3modules/tinc.nix +++ b/krebs/3modules/tinc.nix @@ -155,7 +155,7 @@ with import ; iproutePackage = mkOption { type = types.package; - default = pkgs.iproute; + default = pkgs.iproute2; description = "Iproute2 package to use."; }; -- cgit v1.2.3 From 8f929b04b3de012a9c72306786f076b78aa9f98c Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Tue, 27 Sep 2022 17:01:21 +0200 Subject: external: add kfbox --- krebs/3modules/external/default.nix | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'krebs/3modules') diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix index 62e638730..2748c2523 100644 --- a/krebs/3modules/external/default.nix +++ b/krebs/3modules/external/default.nix @@ -164,6 +164,31 @@ in { }; }; }; + kfbox = { + owner = config.krebs.users.pinpox; + nets = { + retiolum = { + ip4.addr = "10.243.100.102"; + aliases = [ "kfbox.r" ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIICCgKCAgEAis/ORNebUUz/yBTjouXVNoBHTVaEcpZE+cD9EWv975k0evxxb4s5 + W87fZ6YkQgYtgFScaBMgqDbUdi/zMAkhJb2cn+fOGvuH7QqfiuEdG+lncllN9JlS + LpkP11COWmf60ThFieOa39xOT6atZc4cE0MMhw7CJUdIK7Y/EsHH1rVCWFdAKRIw + 4tM7H2Goi7+Tp2guRVFnM/lzRPnIbGOUQxrkMDB2gmpHdCpYWfAQZGzvxlIqrazC + oPcaF0Pk6URkxGWeRUqJnwcGWxxaiA1KW+okma+Mv5k1DMr8pIK0ywWULMkNzjpP + IIJybkeKomOaQmzjZ2RKulOS8A4OOxiDw9Y6I4x+1qFa1seAmYWWafnHCRPQb40g + q5LCTfJaSvYfEEhs9xfo7vBd4IoYsymIQpLUV4BeNINazpRwNIb2AmHSknMnPZFR + Hu8kvN/D6vNlSt7hR+sWU2XgNTJV/MizvG/6N+9wGSPL15dmt8XiSCjSv2mzBSaW + 7bVFoa57Y0OOwZUeK9SRJKMKPfxcNH9zGTMsb0Qnn0zFwscNnkDyA8Z4zPt4GpCX + b3qlAwKFHHVByuDiWrjr6zfSKU/rEU/CRBoWnTcIwSZRhxvAiX82XgUf0qDtFKY9 + Wh+K8/4tfwX9niGTznIIic6Qmbm1O5MNjaPSPCK2bEgEMhQt9YkA4scCAwEAAQ== + -----END RSA PUBLIC KEY----- + ''; + tinc.pubkey_ed25519 = "fXVRppte1zStbyfrbgJwamJXZnHYJkcC15f90u0sUJM"; + }; + }; + }; keller = { owner = config.krebs.users.qubasa; nets = { -- cgit v1.2.3