From c82268f6c951c4f71d57094ca24747b092faccf4 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 17 Aug 2023 20:05:55 +0200 Subject: ma: add podcast.savar.de --- kartei/makefu/default.nix | 10 ++++++++++ kartei/makefu/retiolum/podcast.savar.de.pub | 8 ++++++++ kartei/makefu/retiolum/podcast.savar.de_ed25519.pub | 1 + kartei/makefu/wiregrill/podcast.savar.de.pub | 1 + 4 files changed, 20 insertions(+) create mode 100644 kartei/makefu/retiolum/podcast.savar.de.pub create mode 100644 kartei/makefu/retiolum/podcast.savar.de_ed25519.pub create mode 100644 kartei/makefu/wiregrill/podcast.savar.de.pub (limited to 'kartei') diff --git a/kartei/makefu/default.nix b/kartei/makefu/default.nix index e6c296c75..5cf8ad62a 100644 --- a/kartei/makefu/default.nix +++ b/kartei/makefu/default.nix @@ -96,6 +96,16 @@ in { retiolum.ip4.addr = "10.243.0.212"; }; }; + "podcast.savar.de" = rec { + nets = { + retiolum.ip4 = { + addr = "10.243.136.238"; + aliases = [ + "sava.r" + ]; + }; + }; + }; x = { syncthing.id = "OA36OF6-JEFCUJQ-OEYVTMH-DPCACQI-3AJRE5G-BFVMOUG-RPYJQE3-4ZCUWA5"; nets = { diff --git a/kartei/makefu/retiolum/podcast.savar.de.pub b/kartei/makefu/retiolum/podcast.savar.de.pub new file mode 100644 index 000000000..65da0d5f9 --- /dev/null +++ b/kartei/makefu/retiolum/podcast.savar.de.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/podcast.savar.de_ed25519.pub b/kartei/makefu/retiolum/podcast.savar.de_ed25519.pub new file mode 100644 index 000000000..e08b7f1b7 --- /dev/null +++ b/kartei/makefu/retiolum/podcast.savar.de_ed25519.pub @@ -0,0 +1 @@ +Ed25519PublicKey = s/m2cdP6VguKTzTFLdoHMG7t4+94NNT/+ZHYcmSxSVP diff --git a/kartei/makefu/wiregrill/podcast.savar.de.pub b/kartei/makefu/wiregrill/podcast.savar.de.pub new file mode 100644 index 000000000..f6153f5f8 --- /dev/null +++ b/kartei/makefu/wiregrill/podcast.savar.de.pub @@ -0,0 +1 @@ +mM/QKHTnLlC5qyClRY9WZKg3TK4F+WpLIKRtjCmCCHM= -- cgit v1.2.3 From 00c87e906580a17da2d1f306c415ffc2d2b5fe6e Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 17 Aug 2023 20:42:53 +0200 Subject: ma: podcast.savar.de -> savarcast --- kartei/makefu/default.nix | 6 +++--- kartei/makefu/retiolum/podcast.savar.de.pub | 8 -------- kartei/makefu/retiolum/podcast.savar.de_ed25519.pub | 1 - kartei/makefu/retiolum/savarcast.pub | 8 ++++++++ kartei/makefu/retiolum/savarcast_ed25519.pub | 1 + kartei/makefu/wiregrill/podcast.savar.de.pub | 1 - kartei/makefu/wiregrill/savarcast.pub | 1 + 7 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 kartei/makefu/retiolum/podcast.savar.de.pub delete mode 100644 kartei/makefu/retiolum/podcast.savar.de_ed25519.pub create mode 100644 kartei/makefu/retiolum/savarcast.pub create mode 100644 kartei/makefu/retiolum/savarcast_ed25519.pub delete mode 100644 kartei/makefu/wiregrill/podcast.savar.de.pub create mode 100644 kartei/makefu/wiregrill/savarcast.pub (limited to 'kartei') diff --git a/kartei/makefu/default.nix b/kartei/makefu/default.nix index 5cf8ad62a..646e6a834 100644 --- a/kartei/makefu/default.nix +++ b/kartei/makefu/default.nix @@ -96,14 +96,14 @@ in { retiolum.ip4.addr = "10.243.0.212"; }; }; - "podcast.savar.de" = rec { + savarcast = rec { nets = { retiolum.ip4 = { addr = "10.243.136.238"; - aliases = [ + }; + retiolum.aliases = [ "sava.r" ]; - }; }; }; x = { diff --git a/kartei/makefu/retiolum/podcast.savar.de.pub b/kartei/makefu/retiolum/podcast.savar.de.pub deleted file mode 100644 index 65da0d5f9..000000000 --- a/kartei/makefu/retiolum/podcast.savar.de.pub +++ /dev/null @@ -1,8 +0,0 @@ ------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/podcast.savar.de_ed25519.pub b/kartei/makefu/retiolum/podcast.savar.de_ed25519.pub deleted file mode 100644 index e08b7f1b7..000000000 --- a/kartei/makefu/retiolum/podcast.savar.de_ed25519.pub +++ /dev/null @@ -1 +0,0 @@ -Ed25519PublicKey = s/m2cdP6VguKTzTFLdoHMG7t4+94NNT/+ZHYcmSxSVP diff --git a/kartei/makefu/retiolum/savarcast.pub b/kartei/makefu/retiolum/savarcast.pub new file mode 100644 index 000000000..65da0d5f9 --- /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 000000000..e08b7f1b7 --- /dev/null +++ b/kartei/makefu/retiolum/savarcast_ed25519.pub @@ -0,0 +1 @@ +Ed25519PublicKey = s/m2cdP6VguKTzTFLdoHMG7t4+94NNT/+ZHYcmSxSVP diff --git a/kartei/makefu/wiregrill/podcast.savar.de.pub b/kartei/makefu/wiregrill/podcast.savar.de.pub deleted file mode 100644 index f6153f5f8..000000000 --- a/kartei/makefu/wiregrill/podcast.savar.de.pub +++ /dev/null @@ -1 +0,0 @@ -mM/QKHTnLlC5qyClRY9WZKg3TK4F+WpLIKRtjCmCCHM= diff --git a/kartei/makefu/wiregrill/savarcast.pub b/kartei/makefu/wiregrill/savarcast.pub new file mode 100644 index 000000000..f6153f5f8 --- /dev/null +++ b/kartei/makefu/wiregrill/savarcast.pub @@ -0,0 +1 @@ +mM/QKHTnLlC5qyClRY9WZKg3TK4F+WpLIKRtjCmCCHM= -- cgit v1.2.3 From e157ffa72856e4378aa23b096b2efff233f3cb3d Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 18 Aug 2023 16:19:24 +0200 Subject: kartei/janik: lib -> slib --- kartei/janik/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'kartei') diff --git a/kartei/janik/default.nix b/kartei/janik/default.nix index 44ec9b0a8..a945550d1 100644 --- a/kartei/janik/default.nix +++ b/kartei/janik/default.nix @@ -1,12 +1,12 @@ -with import ../../lib; -{ config, ... }: let - hostDefaults = hostName: host: flip recursiveUpdate host ({ +{ config, lib, ... }: let + slib = import ../../lib/pure.nix { inherit lib; }; + hostDefaults = hostName: host: lib.flip lib.recursiveUpdate host ({ ci = false; external = true; monitoring = false; - } // optionalAttrs (host.nets?retiolum) { + } // lib.optionalAttrs (host.nets?retiolum) { nets.retiolum.ip6.addr = - (krebs.genipv6 "retiolum" "external" { inherit hostName; }).address; + (slib.krebs.genipv6 "retiolum" "external" { inherit hostName; }).address; }); in { users.janik = { @@ -16,7 +16,7 @@ in { owner = config.krebs.users.janik; nets.retiolum = { aliases = [ "hertz.janik.r" ]; - ip6.addr = (lib.krebs.genipv6 "retiolum" "janik" { hostName = "hertz"; }).address; + ip6.addr = (slib.krebs.genipv6 "retiolum" "janik" { hostName = "hertz"; }).address; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- MIICCgKCAgEA0mqxrdVU9wFhNZYGWEknJpKV4yIodNlaCIKDPVhU5wmlzh2szKUS -- cgit v1.2.3 From f157c7b47f249470b4f5cebdc53ce391d938b0b4 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 2 Oct 2023 12:30:49 +0200 Subject: ma wiregrill: update telex key --- kartei/makefu/wiregrill/telex.pub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kartei') diff --git a/kartei/makefu/wiregrill/telex.pub b/kartei/makefu/wiregrill/telex.pub index 12a42177e..668d7ca68 100644 --- a/kartei/makefu/wiregrill/telex.pub +++ b/kartei/makefu/wiregrill/telex.pub @@ -1 +1 @@ -T7Cr80dBbtPFCPdz4OS7whDlQJzn2Orclq5rLVtD+Ds= +Y6fOW2QDt0SsHT7hSVzzJYQVB3JI/txO4/FDB54Z52A= -- cgit v1.2.3 From 13d946bebaf531a7ab95bd9d88d7d42b57fa4ad4 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 14 Jan 2024 21:47:32 +0100 Subject: makefu: add paper.euer to gum --- kartei/makefu/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'kartei') diff --git a/kartei/makefu/default.nix b/kartei/makefu/default.nix index 785ec14eb..d6134cd8d 100644 --- a/kartei/makefu/default.nix +++ b/kartei/makefu/default.nix @@ -137,6 +137,7 @@ in { aliases = [ "omo.r" "dcpp.omo.r" + "hass.omo.r" "backup.makefu.r" "torrent.omo.r" "music.omo.r" @@ -249,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 { -- cgit v1.2.3 From 9a180b351b903dee05e51faab3127ff0643c6e87 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 14 Jan 2024 22:18:43 +0100 Subject: ma telex: update wiregrill key --- kartei/makefu/wiregrill/telex.pub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kartei') diff --git a/kartei/makefu/wiregrill/telex.pub b/kartei/makefu/wiregrill/telex.pub index 668d7ca68..4a5f666cc 100644 --- a/kartei/makefu/wiregrill/telex.pub +++ b/kartei/makefu/wiregrill/telex.pub @@ -1 +1 @@ -Y6fOW2QDt0SsHT7hSVzzJYQVB3JI/txO4/FDB54Z52A= +yAKvxTvcEVdn+MeKsmptZkR3XSEue+wSyLxwcjBYxxo= -- cgit v1.2.3