Merge remote-tracking branch 'Mic92/master'

krebs/3modules/external/default.nix

@@ -320,8 +320,7 @@ in {
           aliases = [
             "zaatar.r"
             "zaatar.kmein.r"
-            "radio.kmein.r"
+            "grocy.kmein.r"
-            "bvg.kmein.r"
             "moodle.kmein.r"
           ];
           tinc.pubkey = ''
@@ -662,6 +661,7 @@ in {
            vDZ+BoHCjq9FfQrAu1+E83yCYyu+3fWrLSgYyrqjg0gPcCcnb1g6hqECAwEAAQ==
            -----END RSA PUBLIC KEY-----
          '';
+         tinc.pubkey_ed25519 = "PiqJGofbo6941m20NJM3yhUoWKTNyLCtTPzsKcrvFSL";
         };
       };
     };
@@ -686,6 +686,7 @@ in {
            /n/eHElmKWoMCXhkV/mee1Cl2Y74XKivM6ov3lLvIDRxdXl46PvBFVkCAwEAAQ==
            -----END RSA PUBLIC KEY-----
          '';
+         tinc.pubkey_ed25519 = "P9yurwK2l1npimgm3yk8WXigWLfEtJ6G1w/3kVCPG7F";
         };
       };
     };

krebs/3modules/external/mic92.nix

@@ -675,6 +675,25 @@ in {
         };
       };
     };
+    jarvis = {
+      owner = config.krebs.users.mic92;
+      nets = rec {
+        retiolum = {
+          aliases = [ "jarvis.r" ];
+          tinc.pubkey = ''
+            -----BEGIN RSA PUBLIC KEY-----
+            MIIBCgKCAQEA7PtJlYBpBr2TK5CAvAukkGvj+esC+sMPKd3mO9iDwdViBrqKdf+D
+            yEy8SI80Y02dpkL97NjvnzepKpyGQWpG1ZQflJLhCTj7oFyVpWd4XsbIuzYp5ES6
+            r8qKWs2xcItc1pbW0ZmrCBzdWsC1B0VAHlYkiz+7vM6pCTvg6hNQugP4c1TRCtJC
+            Sr+n+EjTXN/NTaKl+f7eoHJGnT5liDO3/xZVxm8AuLnron1xPPDghXClVHfDj5mt
+            f66f+CLwZhq3BrZuptwXp7TerMfrNtPyTx96b+EyuLPjrYxKeKL/+Nbr3VmmiDIV
+            tsraNc+0a8OBpVsYh4MQLp55NYwqxAoetQIDAQAB
+            -----END RSA PUBLIC KEY-----
+          '';
+          tinc.pubkey_ed25519 = "RRkMnGSg+nMkz4L2iqmdFf2fIf4wIfcTM0TlTWLLNCE";
+        };
+      };
+    };
     bernie = {
       owner = config.krebs.users.mic92;
       nets = rec {