diff options
| author | makefu <github@syntax-fehler.de> | 2023-12-04 15:06:05 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2023-12-04 15:06:05 +0100 |
| commit | 2ca25d5fc3b5bcabe15b0934208b5f5201420eb2 (patch) | |
| tree | e41e5c3114a57555eca53b4521b99c22ea2056ba /kartei/mic92 | |
| parent | f157c7b47f249470b4f5cebdc53ce391d938b0b4 (diff) | |
| parent | c660bedbb94a9a08c50050a3447f4fc5ba90fd69 (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'kartei/mic92')
| -rw-r--r-- | kartei/mic92/default.nix | 37 |
1 files changed, 32 insertions, 5 deletions
diff --git a/kartei/mic92/default.nix b/kartei/mic92/default.nix index 720b362fd..00fb92128 100644 --- a/kartei/mic92/default.nix +++ b/kartei/mic92/default.nix @@ -80,8 +80,8 @@ in { nets = rec { internet = { # eve.thalheim.io - ip4.addr = "88.99.244.96"; - ip6.addr = "2a01:4f8:10b:49f::1"; + ip4.addr = "95.217.199.121"; + ip6.addr = "2a01:4f9:4a:42e8::1"; aliases = [ "eve.i" ]; }; retiolum = { @@ -844,9 +844,9 @@ in { owner = config.krebs.users.mic92; nets = rec { internet = { - # of4.dse.cit.tum.de. - ip4.addr = "131.159.38.101"; - ip6.addr = "2a09:80c0:38::101"; + # ruby.dse.cit.tum.de. + ip4.addr = "131.159.38.70"; + ip6.addr = "2a09:80c0:38::70"; aliases = [ "ruby.i" ]; }; retiolum = { @@ -978,6 +978,33 @@ in { }; }; }; + + vislor = { + owner = config.krebs.users.mic92; + nets = rec { + internet = { + # vislor.dos.cit.tum.de + ip4.addr = "131.159.102.25"; + ip6.addr = "2a09:80c0:102::25"; + aliases = [ "vislor.i" ]; + }; + retiolum = { + via = internet; + aliases = [ "vislor.r" ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIIBCgKCAQEAnAIEtqtJzQmhAOLMDOp6LvlMoElNezeFarvZ6LshbZbLPL7Mv2Iy + buEoduzGNlqUbqEypsv7pQBSqw4Kqn9jMnpk8EpPiLiqIaBJeGqS1eIHi4DdRIyC + wwOgAqbc0e55LGSRyLS2GgbzD3kHh0UgVF2/MM01r4l53w8ftSJwR5dL6tpKnfgm + wjc8hwQtxen+zym2RJV7E+YPKg2t/ZGTJZbgk54/19l5Eeb18xxfTyxBNdUWBBCo + vnR/h2gfCZnmsj4UiSor+z+00eaDyespfjLw3X7XQkCdlfgx0BVfhXH2RGOtdH+P + AdnLFg7OfGh9V8zAiOC7jyuCrlbh0q0QoQIDAQAB + -----END RSA PUBLIC KEY----- + ''; + tinc.pubkey_ed25519 = "PqpTiIldNgPTKQVnouiGNo8mX0wqSVtg9al6ve/sj2E"; + }; + }; + }; }; users = { mic92 = { |