From 7785b269684d1fe9420fa3b5aa6d57f3e972c380 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Fri, 2 Feb 2024 10:08:54 +0100
Subject: kartei lass: RIP dishfire

---
 kartei/lass/dishfire.nix | 40 ----------------------------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 kartei/lass/dishfire.nix

(limited to 'kartei')

diff --git a/kartei/lass/dishfire.nix b/kartei/lass/dishfire.nix
deleted file mode 100644
index 548320584..000000000
--- a/kartei/lass/dishfire.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ r6, w6, ... }:
-{
-  nets = rec {
-    internet = {
-      ip4 = rec {
-        addr = "157.90.232.92";
-        prefix = "${addr}/32";
-      };
-      aliases = [
-        "dishfire.i"
-      ];
-      ssh.port = 45621;
-    };
-    retiolum = {
-      via = internet;
-      ip4.addr = "10.243.133.99";
-      ip6.addr = r6 "d15f:1233";
-      aliases = [
-        "dishfire.r"
-        "grafana.lass.r"
-        "prometheus.lass.r"
-        "alert.lass.r"
-      ];
-      tinc = {
-        pubkey = ''
-          -----BEGIN RSA PUBLIC KEY-----
-          MIIBCgKCAQEAwKi49fN+0s5Cze6JThM7f7lj4da27PSJ/3w3tDFPvtQco11ksNLs
-          Xd3qPaQIgmcNVCR06aexae3bBeTx9y3qHvKqZVE1nCtRlRyqy1LVKSj15J1D7yz7
-          uS6u/BSZiCzmdZwu3Fq5qqoK0nfzWe/NKEDWNa5l4Mz/BZQyI/hbOpn6UfFD0LpK
-          R4jzc9Dbk/IFNAvwb5yrgEYtwBzlXzeDvHW2JcPq3qQjK2byQYNiIyV3g0GHppEd
-          vDbIPDFhTn3Hv5zz/lX+/We8izzRge7MEd+Vn9Jwb5NAzwDsOHl6ExpqASv9H49U
-          HwgPw5pstabyrsDWXybSYUb+8LcZf+unGwIDAQAB
-          -----END RSA PUBLIC KEY-----
-        '';
-        pubkey_ed25519 = "P+bhzhgTNdohWdec//t/e+8cI7zUOsS+Kq/AOtineAO";
-      };
-    };
-  };
-  ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGv0JMp0y+E5433GRSFKVK3cQmP0AAlS9aH9fk49yFxy";
-}
-- 
cgit v1.2.3


From 593ae434b8a088f59340d6be595cd133b5b72908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Tue, 19 Mar 2024 19:58:27 +0100
Subject: kartei kmein: init fatteh

---
 kartei/kmein/default.nix | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'kartei')

diff --git a/kartei/kmein/default.nix b/kartei/kmein/default.nix
index b096e2843..c840019b5 100644
--- a/kartei/kmein/default.nix
+++ b/kartei/kmein/default.nix
@@ -77,6 +77,28 @@ in
         tinc.pubkey_ed25519 = "KhOetVTVLtGxB22NmZhkTWC0Uhg8rXJv4ayZqchSgCN";
       };
     };
+    fatteh = {
+      nets.retiolum = {
+        aliases = [ "fatteh.r" "fatteh.kmein.r" ];
+        ip4.addr = "10.243.2.77";
+        tinc.pubkey = ''
+          -----BEGIN RSA PUBLIC KEY-----
+          MIICCgKCAgEAoK5mMjFxzogpeg5H0pG224gqjknz3/s0iNqGTwsnuscw2HSBDQLi
+          o3J2Py6tD4pdRlLwAEMewwl/vt8/Um90OFkGCnedQXd/06TzxtYSRONYkCeJ7YIk
+          qxaV9w/KpSFmufR0R284KjAnydP5AIzRQH1fZNNLnxEbaoEkh00J5JrEcFncLd8i
+          8y62ZxnMeD4lzdmn2+dSie3z0cDMWGaGmzFB4ejlD6BmRhQ2TttHSuOaskf7UHv9
+          dywNp3Mm2S1TWzQrDOfWal1OOoct+3aTpruYDrOkP375z4wueonIaI+Zpnd3HbyQ
+          MaosPFFMy330KEWtfJgrX8gPoJDryURqZ5Nlt5fdOmy23ztqPiZowFfGeKDbjl3n
+          i/xMDpgASnyFMZRryh5gqp3Fewzx2EkhLd2y3TFtcZVLrFCsR3m7Pg4IerKi1VuI
+          N0ibCWoScWqV4EHJEcLoXe2tLmZa6fReKkbuJce1oLVINZnUtLNCNM0ogTDFe9Fc
+          X7YAl5TmqOI+HnOnWFez+IJyoIExRAHuLwnWvfh1OGIpsTGRL2NXZbUp8Reh3FQ1
+          8oAoMbQf+z/Wi7ftXc7V3h5WEJJ0kiF8wAUAcUAhOeun3bq7VGyX62ckD+FFJpRe
+          FyxedTdfoU2+94Cx5Ah9I970VG8sdl6Byp0tQCAd8GX9IuJoSCCbtWMCAwEAAQ==
+          -----END RSA PUBLIC KEY-----
+        '';
+        tinc.pubkey_ed25519 = "INp2fKLFIjkGnUGhd+J4X2io3MH9T158d6JYZv3pQ/B";
+      };
+    };
     makanek = {
       nets.retiolum = {
         aliases = [
-- 
cgit v1.2.3