1 files changed, 25 insertions, 27 deletions
diff --git a/krebs/3modules/external/mic92.nix b/krebs/3modules/external/mic92.nix
index 27a2beed..db57b594 100644
--- a/krebs/3modules/external/mic92.nix
+++ b/krebs/3modules/external/mic92.nix
@@ -95,7 +95,6 @@ in {
       owner = config.krebs.users.mic92;
       nets = {
         retiolum = {
-          ip4.addr = "10.243.29.189";
           aliases = [
             "dimitriosxps.r"
           ];
@@ -173,7 +172,12 @@ in {
         };
         retiolum = {
           via = internet;
-          aliases = [ "eve.r" "tts.r" ];
+          aliases = [
+            "eve.r"
+            "tts.r"
+            "flood.r"
+            "navidrome.r"
+          ];
           tinc.pubkey = ''
             -----BEGIN RSA PUBLIC KEY-----
             MIICCgKCAgEAw5cxGjnWCG8dcuhTddvGHzH0/VjxHA5V8qJXH2R5k8ki8dsM5FRH
@@ -279,25 +283,6 @@ in {
         '';
       };
     };
-    philipsaendig = {
-      owner = config.krebs.users.mic92;
-      nets.retiolum = {
-        ip4.addr = "10.243.29.193";
-        aliases = [
-          "philipsaendig.r"
-        ];
-        tinc.pubkey = ''
-          -----BEGIN RSA PUBLIC KEY-----
-          MIIBCgKCAQEAyWdCrXD0M9CIt0ZgVB6W5ozOvLDoxPmGzLBJUnAZV8f9oqfaIEIX
-          5TIaxozN3QMEgS0ChaOHTNFiQZjiiwJL/wPx1eFvKfDkkn7ayrRS/pP+bKhcDpKl
-          4tPejipee9T2ZhYg9tbk291CDBe1fHR5S2F8kPm8OuqwE2Fv9N8wldcsDLxHcTZl
-          +wp4Oe/Wn5WLvZb3SUao17vKnNBLfMMCGC01yRfhZub41NkGYVWBjErsIVxQ+/rF
-          Y7DdCekus+BQCKz+beEmtzG7d0Xwqwkif51HQ05CvwFNEtdUGodd8OrIO+gpIV6S
-          oN+Q5zxsenLo6QRfsLD+nn7A7qbzd57kUwIDAQAB
-          -----END RSA PUBLIC KEY-----
-        '';
-      };
-    };
     yasmin = {
       owner = config.krebs.users.mic92;
       nets.internet = {
@@ -306,7 +291,6 @@ in {
         aliases = [ "yasmin.i" ];
       };
       nets.retiolum = {
-        ip4.addr = "10.243.29.197";
         aliases = [
           "yasmin.r"
         ];
@@ -414,7 +398,6 @@ in {
         };
         retiolum = {
           via = internet;
-          ip4.addr = "10.243.29.195";
           aliases = [ "bill.r" ];
           tinc.pubkey = ''
             -----BEGIN RSA PUBLIC KEY-----
@@ -445,7 +428,6 @@ in {
         };
         retiolum = {
           via = internet;
-          ip4.addr = "10.243.29.173";
           aliases = [ "nardole.r" ];
           tinc.pubkey = ''
             -----BEGIN RSA PUBLIC KEY-----
@@ -470,7 +452,6 @@ in {
       owner = config.krebs.users.mic92;
       nets = {
         retiolum = {
-          ip4.addr = "10.243.29.171";
           aliases = [
             "rock.r"
           ];
@@ -736,7 +717,6 @@ in {
         };
         retiolum = {
           via = internet;
-          ip4.addr = "10.243.29.198";
           aliases = [ "ryan.r" ];
           tinc.pubkey = ''
             -----BEGIN RSA PUBLIC KEY-----
@@ -764,7 +744,6 @@ in {
         };
         retiolum = {
           via = internet;
-          ip4.addr = "10.243.29.199";
           aliases = [ "graham.r" ];
           tinc.pubkey = ''
             -----BEGIN RSA PUBLIC KEY-----
@@ -890,5 +869,24 @@ in {
         };
       };
     };
+    hal9000 = {
+      owner = config.krebs.users.mic92;
+      nets = rec {
+        retiolum = {
+          aliases = [ "hal9000.r" ];
+          tinc.pubkey = ''
+            -----BEGIN RSA PUBLIC KEY-----
+            MIIBCgKCAQEA5aunzoz6WIjeQgfibml6T+UNsXXcoglhCqRkun7WaSHE93SQcCil
+            CDoUoq2aeiGTZ189LgdSyeRL7qmBzgVExIT4NlhfBCkNbHB/sz6epBb9qx49hLh5
+            K/tJfUBYKRd06ymSXPK+cCiO0/gM8fjzI+3GMlYvcbZ+ow11zTRgX/QB2lE1G8cW
+            Obh/nS0af7G6wmovHsKEpry5AxoAPLLi5JaP4hlc/i0iCbebMqb+szF0KBAbmDg3
+            JQ4MYIyQOw9kk7hfqTNFEvJhpbV66id2+ZIHX6QAw7OHBpaY6ZWFd/w2BkJHeayb
+            2jRnsJd0YgautgBGrBrjRWiVmn/f+lJ4XQIDAQAB
+            -----END RSA PUBLIC KEY-----
+          '';
+          tinc.pubkey_ed25519 = "krVYgJo5OFZkyUOgasH9dFve4OI3ewpt8IFhCPan7mB";
+        };
+      };
+    };
   };
 }