Merge remote-tracking branch 'lass/master'

1 files changed, 26 insertions, 2 deletions

diff --git a/krebs/3modules/external/mic92.nix b/krebs/3modules/external/mic92.nix
index f8c371b7f..cd11fb2c5 100644
--- a/krebs/3modules/external/mic92.nix
+++ b/krebs/3modules/external/mic92.nix
@@ -526,8 +526,10 @@ in {
     };
     turingmachine = {
       owner = config.krebs.users.mic92;
-      nets = {
+      nets = rec {
+        internet.addrs = [ "turingmachine.thalheim.io" ];
         retiolum = {
+          via = internet;
           aliases = [
             "turingmachine.r"
           ];
@@ -675,10 +677,33 @@ in {
         };
       };
     };
+    jarvis = {
+      owner = config.krebs.users.mic92;
+      nets = rec {
+        internet.addrs = [ "jarvis.thalheim.io" ];
+        retiolum = {
+          via = internet;
+          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 {
+        internet.addrs = [ "bernie.thalheim.io" ];
         retiolum = {
+          via = internet;
           aliases = [ "bernie.r" ];
           tinc.pubkey = ''
             -----BEGIN RSA PUBLIC KEY-----
@@ -700,7 +725,6 @@ in {
       };
     };
 
-
     ryan = {
       owner = config.krebs.users.mic92;
       nets = rec {