From c1fc2a2902174ec582688dda6567784a8c15945f Mon Sep 17 00:00:00 2001 From: RTUnreal Date: Tue, 11 Apr 2023 20:38:09 +0200 Subject: kartei/rtunreal: init rtgraphene --- kartei/rtunreal/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'kartei') diff --git a/kartei/rtunreal/default.nix b/kartei/rtunreal/default.nix index faa593c63..03b4e192b 100644 --- a/kartei/rtunreal/default.nix +++ b/kartei/rtunreal/default.nix @@ -74,5 +74,11 @@ in tinc.pubkey_ed25519 = "YJE4KD9PhDjxucDAGrbec5Yqqf3A8/VU0J0NV8EPXuN"; }; }; + rtgraphene = { + nets.wiregrill = { + aliases = [ "graphene.rtunreal.w" ]; + wireguard.pubkey = "IZ7tnD5ZVqO886hFzk6k92R70p1J6jYvyIEAWUccehU="; + }; + }; }; } -- cgit v1.3.1 From b3fc238c9d6ff91963f88c46fec72a1a7ac0a746 Mon Sep 17 00:00:00 2001 From: RTUnreal Date: Tue, 11 Apr 2023 22:15:42 +0200 Subject: kartei/rtunreal: add ip4 to rtgraphene --- kartei/rtunreal/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'kartei') diff --git a/kartei/rtunreal/default.nix b/kartei/rtunreal/default.nix index 03b4e192b..9d57c0fce 100644 --- a/kartei/rtunreal/default.nix +++ b/kartei/rtunreal/default.nix @@ -77,6 +77,7 @@ in rtgraphene = { nets.wiregrill = { aliases = [ "graphene.rtunreal.w" ]; + ip4.addr = "10.244.20.20"; wireguard.pubkey = "IZ7tnD5ZVqO886hFzk6k92R70p1J6jYvyIEAWUccehU="; }; }; -- cgit v1.3.1 From 7214a7658fb343f29622fc0b89ba8aaad8b51bf8 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 15 Apr 2023 16:03:51 +0200 Subject: kartei: add trust-gpg script --- kartei/trust-gpg.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100755 kartei/trust-gpg.sh (limited to 'kartei') diff --git a/kartei/trust-gpg.sh b/kartei/trust-gpg.sh new file mode 100755 index 000000000..84b67aeb4 --- /dev/null +++ b/kartei/trust-gpg.sh @@ -0,0 +1,13 @@ +#!/bin/sh +# usage: $0 +set -eu +WD=$(dirname "$(realpath "$0")") +PUBKEYS= +for key in "$WD"/kmein/kmein.gpg "$WD"/lass/pgp/* "$WD"/makefu/pgp/* "$WD"/tv/pgp/*; do + echo "$key" >&2 + keyid=$(gpg --with-colons --fingerprint --import-options show-only --import "$key" | grep fpr | cut -d : -f 10 | head -1) + gpg --import "$key" >&2 + printf '5\ny\n' | gpg --command-fd 0 --expert --edit-key "$keyid" trust >&2 + PUBKEYS="${PUBKEYS}${keyid}\n" +done +printf "$PUBKEYS" -- cgit v1.3.1 From c3a05871bd6423dda1db299746d4fc493868a788 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sun, 16 Apr 2023 21:09:04 +0200 Subject: add bing-gpt gateway --- kartei/mic92/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'kartei') diff --git a/kartei/mic92/default.nix b/kartei/mic92/default.nix index 78206a241..0030133c2 100644 --- a/kartei/mic92/default.nix +++ b/kartei/mic92/default.nix @@ -90,6 +90,7 @@ in { "tts.r" "flood.r" "warez.r" + "bing-gpt.r" "navidrome.r" ]; tinc.pubkey = '' -- cgit v1.3.1 From e115e29cec3882a8c30c4f244139ae16e4fc39d9 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Mon, 17 Apr 2023 16:03:11 +0200 Subject: kartei/mic92: add donna --- kartei/mic92/default.nix | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'kartei') diff --git a/kartei/mic92/default.nix b/kartei/mic92/default.nix index 0030133c2..9dd96dc0b 100644 --- a/kartei/mic92/default.nix +++ b/kartei/mic92/default.nix @@ -911,6 +911,33 @@ in { }; }; + donna = { + owner = config.krebs.users.mic92; + nets = rec { + internet = { + # clara.dse.in.tum.de + ip4.addr = "131.159.38.222"; + ip6.addr = "2a09:80c0:38::222"; + aliases = [ "donna.i" ]; + }; + retiolum = { + via = internet; + aliases = [ "donna.r" ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIIBCgKCAQEAs34lPq8SnVdzMdPkWQMfeM061Yh95wqqGOdGODiyoWdsP0ErRH3/ + HjgmB7luMl7MdL3ZKIpZe/IR2OSAL+6HBE/JPIapO2e1DFFEg42AI58lgjrR0yEr + Q59ZeGu+V95l+jC08IUoS9K6SVTkDCVe2b4Akf5oMtHAAG+ELtzh2zrPH6lkrXYd + LvzIWcrmqu1AnmmUiHT1JleCDfSn2m/ev+LcY109lN7LCFA5VL12/EP2FhM3ELHq + j2gAdvD1LAKq4var2MnR0MnKg0k1vMGSgwK+hj0AoLNiYivo8bxoRBNbUb94o4jQ + 8xfbYyAFxpxdi/bFDmT1UjkouJ1Y8I8GJwIDAQAB + -----END RSA PUBLIC KEY----- + ''; + tinc.pubkey_ed25519 = "8XlFDxQoGq6Fr40PTDyF8GUwP2+YSDp8By0vlKn1OlO"; + }; + }; + }; + clara = { owner = config.krebs.users.mic92; nets = rec { -- cgit v1.3.1 From 0e62d650cf7f1f0ba50eda6f493db6d02d671b08 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 18 Apr 2023 20:11:38 +0200 Subject: kartei/feliks: init ahuatangata --- kartei/feliks/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'kartei') diff --git a/kartei/feliks/default.nix b/kartei/feliks/default.nix index 33f7f9663..88b37cbd5 100644 --- a/kartei/feliks/default.nix +++ b/kartei/feliks/default.nix @@ -7,6 +7,9 @@ with import ../../lib; } // optionalAttrs (host.nets?retiolum) { nets.retiolum.ip6.addr = (krebs.genipv6 "retiolum" "external" { inherit hostName; }).address; + } // optionalAttrs (host.nets?wiregrill) { + nets.wiregrill.ip6.addr = + (krebs.genipv6 "wiregrill" "external" { inherit hostName; }).address; }); in { users.feliks = { @@ -18,7 +21,7 @@ in { nets = { retiolum = { ip4.addr = "10.243.10.243"; - aliases = [ "papawhakaaro.r" ]; + aliases = [ "papawhakaaro.r" "tp.feliks.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- MIICCgKCAgEA4bd0lVUVlzFmM8TuH77C5VctcK4lkw02LbMVQDJ5U+Ww075nNahw @@ -43,7 +46,7 @@ in { nets = { retiolum = { ip4.addr = "10.243.10.244"; - aliases = [ "iti.r" ]; + aliases = [ "iti.r" "ltd.feliks.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- MIICCgKCAgEA5TXEmw3F3lCekITBPW8QYF1ciKHN8RSi47k1vW+jXb6gdWcVo5KL @@ -68,7 +71,7 @@ in { nets = { retiolum = { ip4.addr = "10.243.10.245"; - aliases = [ "tumaukainga.r" ]; + aliases = [ "tumaukainga.r" "hs.feliks.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- MIICCgKCAgEAj1q28QzUlag0i+2ZEpZyQEbrtuODj6pCCt2IX1Uz1B83outO2l/n @@ -88,5 +91,11 @@ in { }; }; }; + ahuatangata = { + nets.wiregrill = { + aliases = [ "ahuatangata" "ndrd.feliks.r" ]; + wireguard.pubkey = "IZ7tnD5ZVqO886hFzk6k92R70p1J6jYvyIEAWUccehU="; + }; + }; }; } -- cgit v1.3.1 From 600a8abc8a862ae0aa1554164e5dc48979a4684a Mon Sep 17 00:00:00 2001 From: lenny Date: Tue, 18 Apr 2023 20:28:08 +0200 Subject: kartei: init mokemoke --- kartei/ynnel/default.nix | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 kartei/ynnel/default.nix (limited to 'kartei') diff --git a/kartei/ynnel/default.nix b/kartei/ynnel/default.nix new file mode 100644 index 000000000..e7d985278 --- /dev/null +++ b/kartei/ynnel/default.nix @@ -0,0 +1,32 @@ +{ config, ... }: +let + lib = import ../../lib; +in +{ + users.ynnel = { + mail = "retiolum@lenny.ninja"; + }; + hosts.mokemoke = { + owner = config.krebs.users.ynnel; + nets.retiolum = { + aliases = [ "mokemoke.ynnel.r" ]; + ip6.addr = (lib.krebs.genipv6 "retiolum" "ynnel" { hostName = "mokemoke"; }).address; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIICCgKCAgEA7rS560SZEPcSekW30dRF6ZTHOnb8WvuVgt3BFLRWhTgV5DqLqFa8 + fxT2TJci8ogYZtlnSCNKEhxup3wlIrAPLLzu5jL6hx4okfmyARGQqeUn9kD+jmGL + 9N9wjGXDp/CVyMIb5mcK2l0mvElvs7ae700GScq+2ASsFTHC/w2w2KoeDtt/UED9 + Cjy+kxP7SuzksigIuuA8gncf9FmfRgG31XGctX1H6hUywtq05oVRd5qMHeiI/l4v + jHJSadtlR1FuExMT9l7nRZ98yOLKWhDUym4qmi/3zsnDl38f9gcqlp040McUqfZl + 6mclphcthOv6xp7nCbEd58djBU1hrPHJJrk5qL0CGcTwaTBzZFvrV4lklfBFPhVv + dwiagzZDsTvQfXe7UJTSHOKhw+i7a7ok2n+IFhyd+GnQYeOvaBropjYgYDHbZ/u7 + d6E1xUVjANLtt2oOYfaH/LlERgucEcQY2qRyMBQXYTwp+d3ThTc+Vs0Lbo08rvFN + y76KXPsH8ptVVFK4DclK0GxI64JpnSmG/BHcU114K7LPNONQBSvE8UyZlMVkuZfc + qwBzyM70tKPoWmoxjBkQcXsK6JgclXohZ0jbMhRV5K4oDocAhEuUtOC5qG4IZo+R + BWc0bxueCaOQFqB6UKcZLgCj6ZhXHpqTSk/8MBevxrbH44I+4oYwQOkCAwEAAQ== + -----END RSA PUBLIC KEY----- + ''; + tinc.pubkey_ed25519 = "um4yKCJkkBX9pISAa78SttNSqyEPhpCDGfL6FJA0wzK"; + }; + }; +} -- cgit v1.3.1 From cc46eddcd82227dbc1080005efbd79ac24cf8dab Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 18 Apr 2023 22:34:45 +0200 Subject: kartei/feliks: add ip4 to ahuatangata --- kartei/feliks/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'kartei') diff --git a/kartei/feliks/default.nix b/kartei/feliks/default.nix index 88b37cbd5..97fc27fad 100644 --- a/kartei/feliks/default.nix +++ b/kartei/feliks/default.nix @@ -93,6 +93,7 @@ in { }; ahuatangata = { nets.wiregrill = { + ip4.addr = "10.243.10.246"; aliases = [ "ahuatangata" "ndrd.feliks.r" ]; wireguard.pubkey = "IZ7tnD5ZVqO886hFzk6k92R70p1J6jYvyIEAWUccehU="; }; -- cgit v1.3.1 From 48469cc891e2e621bcce6fbd529124d5a93f7cf7 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 18 Apr 2023 22:46:39 +0200 Subject: kartei/feliks: fix wiregrill pubkey --- kartei/feliks/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kartei') diff --git a/kartei/feliks/default.nix b/kartei/feliks/default.nix index 97fc27fad..58a3e2498 100644 --- a/kartei/feliks/default.nix +++ b/kartei/feliks/default.nix @@ -95,7 +95,7 @@ in { nets.wiregrill = { ip4.addr = "10.243.10.246"; aliases = [ "ahuatangata" "ndrd.feliks.r" ]; - wireguard.pubkey = "IZ7tnD5ZVqO886hFzk6k92R70p1J6jYvyIEAWUccehU="; + wireguard.pubkey = "QPDGBEYJ1znqUdjy6JWZJ+cqPMcU67dHlOX5beTM6TA="; }; }; }; -- cgit v1.3.1 From 84ccb812a3c76b6f56e7173bcab7bed7907a0ddf Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 18 Apr 2023 23:07:48 +0200 Subject: ahuatangata.r: fix ipv4 range --- kartei/feliks/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kartei') diff --git a/kartei/feliks/default.nix b/kartei/feliks/default.nix index 58a3e2498..0e68d3980 100644 --- a/kartei/feliks/default.nix +++ b/kartei/feliks/default.nix @@ -93,7 +93,7 @@ in { }; ahuatangata = { nets.wiregrill = { - ip4.addr = "10.243.10.246"; + ip4.addr = "10.244.10.246"; aliases = [ "ahuatangata" "ndrd.feliks.r" ]; wireguard.pubkey = "QPDGBEYJ1znqUdjy6JWZJ+cqPMcU67dHlOX5beTM6TA="; }; -- cgit v1.3.1 From 4a57bde3df423bc1d8317690d56bbd60286c45b3 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 19 Apr 2023 15:04:00 +0200 Subject: kartei tv ni: update internet addresses --- kartei/tv/hosts/ni.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kartei') diff --git a/kartei/tv/hosts/ni.nix b/kartei/tv/hosts/ni.nix index c45321656..aae5c5cd4 100644 --- a/kartei/tv/hosts/ni.nix +++ b/kartei/tv/hosts/ni.nix @@ -17,11 +17,11 @@ nets = { internet = { ip4 = rec { - addr = "188.68.36.196"; + addr = "185.162.251.237"; prefix = "${addr}/32"; }; ip6 = rec { - addr = "2a03:4000:13:4c::1"; + addr = "2a03:4000:1a:cf::1"; prefix = "${addr}/64"; }; aliases = [ -- cgit v1.3.1 From bc63f4e56b617fad9027ed74403cd34ba00b5a02 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sun, 23 Apr 2023 11:46:34 +0200 Subject: kartei/mic92: replace llama.r with vicuna.r --- kartei/mic92/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kartei') diff --git a/kartei/mic92/default.nix b/kartei/mic92/default.nix index 9dd96dc0b..952b5fd40 100644 --- a/kartei/mic92/default.nix +++ b/kartei/mic92/default.nix @@ -789,7 +789,7 @@ in { aliases = [ "jack.r" "stable-confusion.r" - "llama.r" + "vicuna.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- -- cgit v1.3.1 From 4bf2909be3afb5e834cacdb4d6f949e4dd78400e Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 23 Apr 2023 14:07:55 +0200 Subject: kartei feliks: define owner for all hosts --- kartei/feliks/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'kartei') diff --git a/kartei/feliks/default.nix b/kartei/feliks/default.nix index 0e68d3980..e98da7bc6 100644 --- a/kartei/feliks/default.nix +++ b/kartei/feliks/default.nix @@ -1,6 +1,7 @@ with import ../../lib; { config, ... }: let hostDefaults = hostName: host: flip recursiveUpdate host ({ + owner = config.krebs.users.feliks; ci = false; external = true; monitoring = false; @@ -17,7 +18,6 @@ in { }; hosts = mapAttrs hostDefaults { papawhakaaro = { - owner = config.krebs.users.feliks; nets = { retiolum = { ip4.addr = "10.243.10.243"; @@ -42,7 +42,6 @@ in { }; }; iti = { - owner = config.krebs.users.feliks; nets = { retiolum = { ip4.addr = "10.243.10.244"; @@ -67,7 +66,6 @@ in { }; }; tumaukainga = { - owner = config.krebs.users.feliks; nets = { retiolum = { ip4.addr = "10.243.10.245"; -- cgit v1.3.1