diff options
Diffstat (limited to 'kartei')
| -rw-r--r-- | kartei/kmein/default.nix | 22 | ||||
| -rw-r--r-- | kartei/makefu/default.nix | 12 | ||||
| -rw-r--r-- | kartei/makefu/retiolum/savarcast.pub | 8 | ||||
| -rw-r--r-- | kartei/makefu/retiolum/savarcast_ed25519.pub | 1 | ||||
| -rw-r--r-- | kartei/makefu/wiregrill/savarcast.pub | 1 | ||||
| -rw-r--r-- | kartei/makefu/wiregrill/telex.pub | 2 | ||||
| -rw-r--r-- | kartei/mic92/default.nix | 3 | ||||
| -rw-r--r-- | kartei/rtunreal/default.nix | 22 | ||||
| -rw-r--r-- | kartei/tv/hosts/leg.nix | 3 | ||||
| -rw-r--r-- | kartei/tv/hosts/pa.nix | 3 | ||||
| -rw-r--r-- | kartei/tv/wiregrill/pa.pub | 1 |
11 files changed, 74 insertions, 4 deletions
diff --git a/kartei/kmein/default.nix b/kartei/kmein/default.nix index b096e284..c840019b 100644 --- a/kartei/kmein/default.nix +++ b/kartei/kmein/default.nix @@ -77,6 +77,28 @@ in tinc.pubkey_ed25519 = "KhOetVTVLtGxB22NmZhkTWC0Uhg8rXJv4ayZqchSgCN"; }; }; + fatteh = { + nets.retiolum = { + aliases = [ "fatteh.r" "fatteh.kmein.r" ]; + ip4.addr = "10.243.2.77"; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIICCgKCAgEAoK5mMjFxzogpeg5H0pG224gqjknz3/s0iNqGTwsnuscw2HSBDQLi + o3J2Py6tD4pdRlLwAEMewwl/vt8/Um90OFkGCnedQXd/06TzxtYSRONYkCeJ7YIk + qxaV9w/KpSFmufR0R284KjAnydP5AIzRQH1fZNNLnxEbaoEkh00J5JrEcFncLd8i + 8y62ZxnMeD4lzdmn2+dSie3z0cDMWGaGmzFB4ejlD6BmRhQ2TttHSuOaskf7UHv9 + dywNp3Mm2S1TWzQrDOfWal1OOoct+3aTpruYDrOkP375z4wueonIaI+Zpnd3HbyQ + MaosPFFMy330KEWtfJgrX8gPoJDryURqZ5Nlt5fdOmy23ztqPiZowFfGeKDbjl3n + i/xMDpgASnyFMZRryh5gqp3Fewzx2EkhLd2y3TFtcZVLrFCsR3m7Pg4IerKi1VuI + N0ibCWoScWqV4EHJEcLoXe2tLmZa6fReKkbuJce1oLVINZnUtLNCNM0ogTDFe9Fc + X7YAl5TmqOI+HnOnWFez+IJyoIExRAHuLwnWvfh1OGIpsTGRL2NXZbUp8Reh3FQ1 + 8oAoMbQf+z/Wi7ftXc7V3h5WEJJ0kiF8wAUAcUAhOeun3bq7VGyX62ckD+FFJpRe + FyxedTdfoU2+94Cx5Ah9I970VG8sdl6Byp0tQCAd8GX9IuJoSCCbtWMCAwEAAQ== + -----END RSA PUBLIC KEY----- + ''; + tinc.pubkey_ed25519 = "INp2fKLFIjkGnUGhd+J4X2io3MH9T158d6JYZv3pQ/B"; + }; + }; makanek = { nets.retiolum = { aliases = [ diff --git a/kartei/makefu/default.nix b/kartei/makefu/default.nix index f215f1fc..d6134cd8 100644 --- a/kartei/makefu/default.nix +++ b/kartei/makefu/default.nix @@ -96,6 +96,16 @@ in { retiolum.ip4.addr = "10.243.0.212"; }; }; + savarcast = rec { + nets = { + retiolum.ip4 = { + addr = "10.243.136.238"; + }; + retiolum.aliases = [ + "sava.r" + ]; + }; + }; x = { syncthing.id = "OA36OF6-JEFCUJQ-OEYVTMH-DPCACQI-3AJRE5G-BFVMOUG-RPYJQE3-4ZCUWA5"; nets = { @@ -127,6 +137,7 @@ in { aliases = [ "omo.r" "dcpp.omo.r" + "hass.omo.r" "backup.makefu.r" "torrent.omo.r" "music.omo.r" @@ -239,6 +250,7 @@ in { ul.work.euer IN A ${nets.internet.ip4.addr} music.euer IN A ${nets.internet.ip4.addr} ntfy.euer IN A ${nets.internet.ip4.addr} + paper.euer IN A ${nets.internet.ip4.addr} ''; }; nets = rec { diff --git a/kartei/makefu/retiolum/savarcast.pub b/kartei/makefu/retiolum/savarcast.pub new file mode 100644 index 00000000..65da0d5f --- /dev/null +++ b/kartei/makefu/retiolum/savarcast.pub @@ -0,0 +1,8 @@ +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAvxhCwL7g+p3rp2aelJHKHowLLcDZVqZnsuViW5jzQ5kQuDB6Rc7f +IiUXXzg6/BL2o7jUW1gRrHbiVy7360HxsTwQvV8j0/s+UsCQCybWclGE2NlsjCUM +xi/zTn/R523o43J4t6L7ohDlJVBCPMVJu5ZWVIlMAWSHI45WFu9JAyKOZJnPEYQb +eyw8P93ztZyijoRTV1SEYK9FiSsfmNgGIqPlE6QPE1S+oR6j+718WSrmQjcBO8uO +cbj4ZPEgokYRF+WH4m9fPfkTWH6qQ1idqiWZfeUR2TfLLDQ+zDpJpoXlXk/JOqMu +7kdx3dfuiulI93pUDVeGXh0YCyTmVvavdQIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/kartei/makefu/retiolum/savarcast_ed25519.pub b/kartei/makefu/retiolum/savarcast_ed25519.pub new file mode 100644 index 00000000..e08b7f1b --- /dev/null +++ b/kartei/makefu/retiolum/savarcast_ed25519.pub @@ -0,0 +1 @@ +Ed25519PublicKey = s/m2cdP6VguKTzTFLdoHMG7t4+94NNT/+ZHYcmSxSVP diff --git a/kartei/makefu/wiregrill/savarcast.pub b/kartei/makefu/wiregrill/savarcast.pub new file mode 100644 index 00000000..f6153f5f --- /dev/null +++ b/kartei/makefu/wiregrill/savarcast.pub @@ -0,0 +1 @@ +mM/QKHTnLlC5qyClRY9WZKg3TK4F+WpLIKRtjCmCCHM= diff --git a/kartei/makefu/wiregrill/telex.pub b/kartei/makefu/wiregrill/telex.pub index 12a42177..4a5f666c 100644 --- a/kartei/makefu/wiregrill/telex.pub +++ b/kartei/makefu/wiregrill/telex.pub @@ -1 +1 @@ -T7Cr80dBbtPFCPdz4OS7whDlQJzn2Orclq5rLVtD+Ds= +yAKvxTvcEVdn+MeKsmptZkR3XSEue+wSyLxwcjBYxxo= diff --git a/kartei/mic92/default.nix b/kartei/mic92/default.nix index 96edeba5..7ad62514 100644 --- a/kartei/mic92/default.nix +++ b/kartei/mic92/default.nix @@ -74,9 +74,6 @@ in { }; eve = { owner = config.krebs.users.mic92; - extraZones."krebsco.de" = '' - mukke IN CNAME eve.thalheim.io. - ''; nets = rec { internet = { # eve.thalheim.io diff --git a/kartei/rtunreal/default.nix b/kartei/rtunreal/default.nix index de6c528f..8418697b 100644 --- a/kartei/rtunreal/default.nix +++ b/kartei/rtunreal/default.nix @@ -32,6 +32,28 @@ in }; }; hosts = mapAttrs hostDefaults { + rtworker = { + nets.retiolum = { + aliases = [ "worker.rtunreal.r" ]; + ip4.addr = "10.243.20.24"; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIICCgKCAgEAs6abzbB+Jljux8ivE8gtuYpTxP3FDcXQ+p8DKwadwXyDwehfyKpJ + nMMOBPnFzUgrN9zTx7Y1unvzjyxDUoyCBrDv6VLG+cS1wDQJTkovVjqWgZAWEg66 + UteNIxZoTqkQan8UD1Hb2rStpI+1C/fgqc4Kc0KX10sBp9qpsUBWwXqsXGsGOWEm + zLqjM5o0HnK9s4vKHatxvxe1yNoFiivsYDiiStnx0jXHuWcsDcazJeTYLJAdS9mC + nMfvpp6QTlDiGxxYzQrImo+KZ5aD3ugtvChK0UyIwdD1FDjgHm/NsZ1spheBhCNA + ddmS5s5xhwh86wMnbOIdrPYJweGyw4jLX6C3nqO/WJegJsfRFPKcBc0oR2lZ3pk+ + JkcvdbxiqRBEuDjttkGia4TbJ8jFHDfGDAmuIMa0Oa0GmuF+DD3Fm6GTXsKTS2jZ + sAL3b5wH1iOWCKYQhZmHlqw9DiaywsNKeH+/YtAAArH0Mle1yDP0QwSHvI3xlg5H + 6igmHcK70j0ZYQKQHm5Y6FboUTZUsXkIQFdMOdHUW2KeFVQOHDpnH/dXYW97Z0fU + e4/SOdveJmF1QOygwhdddcumblBJIk0ljMkIA1fo8D4viCo6Vu0wwZbzAXhZlYkr + dXVy/bhx6xNjFMsNvmsdGx7NEulyukrApLy3JmVYZEYvcKd5lMmvxksCAwEAAQ== + -----END RSA PUBLIC KEY----- + ''; + tinc.pubkey_ed25519 = "cm3VTJMq+Z9JDaIAZhgNjs5nYOHzM8m4gglX4YCFfnF"; + }; + }; rtspinner = { nets.retiolum = { aliases = [ "spinner.rtunreal.r" ]; diff --git a/kartei/tv/hosts/leg.nix b/kartei/tv/hosts/leg.nix index aa023b42..c0974930 100644 --- a/kartei/tv/hosts/leg.nix +++ b/kartei/tv/hosts/leg.nix @@ -17,6 +17,9 @@ ''; tinc.pubkey_ed25519 = " qmxNtjkjzXP4QCIJwXLncYFrIfU7royMlQNSVvR3XKH"; }; + wiregrill = { + ip4.addr = "10.244.3.43"; + }; }; secure = true; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGiputkYYQbg8sUHu+dMVOEuqhPYwPhPdmkS6LopPx17 root@leg"; diff --git a/kartei/tv/hosts/pa.nix b/kartei/tv/hosts/pa.nix new file mode 100644 index 00000000..95026a24 --- /dev/null +++ b/kartei/tv/hosts/pa.nix @@ -0,0 +1,3 @@ +{ + nets.wiregrill.ip4.addr = "10.244.3.103"; +} diff --git a/kartei/tv/wiregrill/pa.pub b/kartei/tv/wiregrill/pa.pub new file mode 100644 index 00000000..3af7a8e7 --- /dev/null +++ b/kartei/tv/wiregrill/pa.pub @@ -0,0 +1 @@ +X+Sm5uyeI1B6cVeyxPz0YXy6L5jrs2GKwfjfPuF67GA= |