summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2022-01-20 11:30:52 +0100
committerJörg Thalheim <joerg@thalheim.io>2022-01-27 04:21:01 +0100
commitbfb86ca39acd1cefa96d3507d45796828d4a8db5 (patch)
treeb187d55002ff877df08be54b697b9569e597b5cc /krebs
parent3b2fc2105feffbee2aba8cf99e5367740d1c10b9 (diff)
mic92: add astrid
Diffstat (limited to 'krebs')
-rw-r--r--krebs/3modules/external/mic92.nix55
1 files changed, 54 insertions, 1 deletions
diff --git a/krebs/3modules/external/mic92.nix b/krebs/3modules/external/mic92.nix
index cd11fb2c5..b3be385b2 100644
--- a/krebs/3modules/external/mic92.nix
+++ b/krebs/3modules/external/mic92.nix
@@ -805,10 +805,16 @@ in {
mickey = {
owner = config.krebs.users.mic92;
nets = rec {
+ internet = {
+ # mickey.dse.in.tum.de
+ ip4.addr = "131.159.102.10";
+ ip6.addr = "2a09:80c0:102::10";
+ aliases = [ "mickey.i" ];
+ };
retiolum = {
+ via = internet;
aliases = [ "mickey.r" ];
tinc.pubkey = ''
- Ed25519PublicKey = cE450gYxzp9kAzV5ytU9N7aV+WdnD7wQMjkPWV7r/bC
-----BEGIN RSA PUBLIC KEY-----
MIICCgKCAgEA7TwI3/tyl3z46Enr6p/0bpl5CpG6DZLxjAhsMcWBM+4xTL9s18IZ
2FGbyS3EyOBprMBQULrik1u0rfZ0AL8XdO6h+r1BD6XmlZtUu3FJaVeXrLBPGtC0
@@ -823,8 +829,55 @@ in {
RA8gQM/P3j1EmDvemlskWOoCLVELR40BtKdM9MFiGqxGMoNh3DvGWTECAwEAAQ==
-----END RSA PUBLIC KEY-----
'';
+ tinc.pubkey_ed25519 = "cE450gYxzp9kAzV5ytU9N7aV+WdnD7wQMjkPWV7r/bC";
};
};
};
+
+ astrid = {
+ owner = config.krebs.users.mic92;
+ nets = rec {
+ internet = {
+ # astrid.dse.in.tum.de
+ ip4.addr = "131.159.102.11";
+ ip6.addr = "2a09:80c0:102::11";
+ aliases = [ "astrid.i" ];
+ };
+ retiolum = {
+ aliases = [ "astrid.r" ];
+ tinc.pubkey = ''
+ -----BEGIN RSA PUBLIC KEY-----
+ MIIBCgKCAQEArYO78+rLxDYBxt1MZ4VDjdSvoxJ8/De5R+/Yo0Uh1vJJtlkQUfAK
+ o2uOQvX76Y1EByAu1hMKsquDJrmnEQKyaBVUv1xkU9kQPxDoUkHdQaMoyjjCLKHV
+ 7OjRRQ+PCAjCVfaIR4P0pXGXShBYVqITdr8R/fH7f+M6I+s/H4KTo9zpRY9YUzXV
+ V6t3PCTMBXWxa2kNTSTe1zpGHccOd3FWs6r+0DZ2bPg/6Qh/VszQI7NXRqgSLNgi
+ J1+PaO0h9IfICNYYaWg1r9gh6nd52U9S2B6eipizrdWdyHuufWzn52liNztSEe9g
+ 5VC0PPAZFIxEkhoAP/HGTnNvXLOo960IXwIDAQAB
+ -----END RSA PUBLIC KEY-----
+ '';
+ tinc.pubkey_ed25519 = "I0rk5Co9QEuyramaxNSI2Rq43qgRF2tJr5Lf8nlBjUO";
+ };
+ };
+ };
+
+ # TODO
+ #dan = {
+ # owner = config.krebs.users.mic92;
+ # nets = rec {
+ # internet = {
+ # # dan.dse.in.tum.de
+ # ip4.addr = "131.159.102.12";
+ # ip6.addr = "2a09:80c0:102::12";
+ # aliases = [ "dan.i" ];
+ # };
+ # retiolum = {
+ # via = internet;
+ # aliases = [ "dan.r" ];
+ # tinc.pubkey = ''
+ # '';
+ # tinc.pubkey_ed25519 = "";
+ # };
+ # };
+ #};
};
}