diff options
| author | tv <tv@krebsco.de> | 2022-01-07 20:55:09 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2022-01-07 20:55:09 +0100 |
| commit | 622fe9c4ab9bc55f673aff9c48ca268b2d082459 (patch) | |
| tree | a380ba5bf4d36599a9014b91df52138c3f9b306b /krebs/3modules | |
| parent | 13db0ce256ec67c6e21bd85a7d398ccdb180988f (diff) | |
| parent | d814ddd21239e323676afc4f9c780b340857a624 (diff) | |
Merge remote-tracking branch 'Mic92/master'
Diffstat (limited to 'krebs/3modules')
| -rw-r--r-- | krebs/3modules/external/default.nix | 5 | ||||
| -rw-r--r-- | krebs/3modules/external/mic92.nix | 19 |
2 files changed, 22 insertions, 2 deletions
diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix index 4c4e53f2f..4a1efe8fc 100644 --- a/krebs/3modules/external/default.nix +++ b/krebs/3modules/external/default.nix @@ -320,8 +320,7 @@ in { aliases = [ "zaatar.r" "zaatar.kmein.r" - "radio.kmein.r" - "bvg.kmein.r" + "grocy.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"; }; }; }; diff --git a/krebs/3modules/external/mic92.nix b/krebs/3modules/external/mic92.nix index f8c371b7f..349a6c343 100644 --- a/krebs/3modules/external/mic92.nix +++ b/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 { |