From 7785b269684d1fe9420fa3b5aa6d57f3e972c380 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 2 Feb 2024 10:08:54 +0100 Subject: [PATCH 1/9] kartei lass: RIP dishfire --- kartei/lass/dishfire.nix | 40 ---------------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 kartei/lass/dishfire.nix diff --git a/kartei/lass/dishfire.nix b/kartei/lass/dishfire.nix deleted file mode 100644 index 548320584..000000000 --- a/kartei/lass/dishfire.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ r6, w6, ... }: -{ - nets = rec { - internet = { - ip4 = rec { - addr = "157.90.232.92"; - prefix = "${addr}/32"; - }; - aliases = [ - "dishfire.i" - ]; - ssh.port = 45621; - }; - retiolum = { - via = internet; - ip4.addr = "10.243.133.99"; - ip6.addr = r6 "d15f:1233"; - aliases = [ - "dishfire.r" - "grafana.lass.r" - "prometheus.lass.r" - "alert.lass.r" - ]; - tinc = { - pubkey = '' - -----BEGIN RSA PUBLIC KEY----- - MIIBCgKCAQEAwKi49fN+0s5Cze6JThM7f7lj4da27PSJ/3w3tDFPvtQco11ksNLs - Xd3qPaQIgmcNVCR06aexae3bBeTx9y3qHvKqZVE1nCtRlRyqy1LVKSj15J1D7yz7 - uS6u/BSZiCzmdZwu3Fq5qqoK0nfzWe/NKEDWNa5l4Mz/BZQyI/hbOpn6UfFD0LpK - R4jzc9Dbk/IFNAvwb5yrgEYtwBzlXzeDvHW2JcPq3qQjK2byQYNiIyV3g0GHppEd - vDbIPDFhTn3Hv5zz/lX+/We8izzRge7MEd+Vn9Jwb5NAzwDsOHl6ExpqASv9H49U - HwgPw5pstabyrsDWXybSYUb+8LcZf+unGwIDAQAB - -----END RSA PUBLIC KEY----- - ''; - pubkey_ed25519 = "P+bhzhgTNdohWdec//t/e+8cI7zUOsS+Kq/AOtineAO"; - }; - }; - }; - ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGv0JMp0y+E5433GRSFKVK3cQmP0AAlS9aH9fk49yFxy"; -} From cb63f7b6c5b9993b4d0a25347f7813e707f6dfe3 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 16 Feb 2024 18:06:24 +0100 Subject: [PATCH 2/9] update nixpkgs --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 6fba339f5..9a05f5a3c 100644 --- a/flake.lock +++ b/flake.lock @@ -18,11 +18,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702151865, - "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=", + "lastModified": 1707956935, + "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd", + "rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c", "type": "github" }, "original": { From e533d64f1f3b8d23bdb15668b37871a603157a85 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 6 Mar 2024 11:28:00 +0100 Subject: [PATCH 3/9] stable-generate: fix curl usage --- krebs/5pkgs/simple/stable-generate/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krebs/5pkgs/simple/stable-generate/default.nix b/krebs/5pkgs/simple/stable-generate/default.nix index dc9c826f9..31cf6c23d 100644 --- a/krebs/5pkgs/simple/stable-generate/default.nix +++ b/krebs/5pkgs/simple/stable-generate/default.nix @@ -18,7 +18,7 @@ pkgs.writers.writeBashBin "stable-generate" '' filename=$(mktemp) curl -Ssf "$STABLE_URL/sdapi/v1/txt2img" \ -X POST \ - --Header 'Content-Type: application/json' \ + --header 'Content-Type: application/json' \ --data "$PAYLOAD" | jq -r '.images[0]' | base64 --decode > "$filename" From 9e2fe26517619d63df983ad0557c6554d2c6f280 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 17 Mar 2024 10:04:05 +0100 Subject: [PATCH 4/9] sync-containers3: add hostname option --- krebs/3modules/sync-containers3.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/krebs/3modules/sync-containers3.nix b/krebs/3modules/sync-containers3.nix index 7373592a5..ed72ca30c 100644 --- a/krebs/3modules/sync-containers3.nix +++ b/krebs/3modules/sync-containers3.nix @@ -43,6 +43,14 @@ in { fi ''; }; + hostname = lib.mkOption { + type = lib.types.str; + description = '' + hostname of the container, + his is continously checked by ping and the container is restarted if unreachable + ''; + default = config.name; + }; }; })); }; @@ -110,8 +118,8 @@ in { set -efux consul lock sync_${ctr.name} ${pkgs.writers.writeDash "${ctr.name}-sync" '' set -efux - if ping -c 1 ${ctr.name}.r; then - nice --adjustment=30 rsync -a -e "ssh -i $CREDENTIALS_DIRECTORY/ssh_key" --timeout=30 --inplace --sparse container_sync@${ctr.name}.r:disk "$HOME"/disk.rsync + if ping -c 1 ${ctr.hostname}; then + nice --adjustment=30 rsync -a -e "ssh -i $CREDENTIALS_DIRECTORY/ssh_key" --timeout=30 --inplace --sparse container_sync@${ctr.hostname}:disk "$HOME"/disk.rsync touch "$HOME"/incomplete nice --adjustment=30 rsync --inplace "$HOME"/disk.rsync "$HOME"/disk rm -f "$HOME"/incomplete @@ -153,7 +161,7 @@ in { export payload if [ "$(jq -rn 'env.payload | fromjson.host')" = '${config.networking.hostName}' ]; then # echo 'we are the host, trying to reach container' - if $(retry -t 10 -d 10 -- ping -q -c 1 ${ctr.name}.r > /dev/null); then + if $(retry -t 10 -d 10 -- ping -q -c 1 ${ctr.hostname} > /dev/null); then # echo 'container is reachable, continueing' continue else @@ -237,8 +245,8 @@ in { /run/current-system/sw/bin/nixos-container start ${ctr.name} # wait for system to become reachable for the first time systemctl start ${ctr.name}_watcher.service - retry -t 10 -d 10 -- ping -q -c 1 ${ctr.name}.r > /dev/null - while systemctl is-active container@${ctr.name}.service >/devnull && ping -q -c 3 ${ctr.name}.r >/dev/null; do + retry -t 10 -d 10 -- ping -q -c 1 ${ctr.hostname} > /dev/null + while systemctl is-active container@${ctr.name}.service >/devnull && ping -q -c 3 ${ctr.hostname} >/dev/null; do consul kv put containers/${ctr.name} "$(jq -cn '{host: "${config.networking.hostName}", time: now}')" >/dev/null sleep 10 done From a89f923b1aa86a1fa6352d2dceb1bc8124a0ced7 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 17 Mar 2024 10:04:32 +0100 Subject: [PATCH 5/9] sync-containers3: get rid of stateVersion warning --- krebs/3modules/sync-containers3.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/krebs/3modules/sync-containers3.nix b/krebs/3modules/sync-containers3.nix index ed72ca30c..12a5ee4e7 100644 --- a/krebs/3modules/sync-containers3.nix +++ b/krebs/3modules/sync-containers3.nix @@ -76,6 +76,8 @@ in { serviceConfig.ExecStart = pkgs.writers.writeDash "autoswitch" ctr.startCommand; unitConfig.X-StopOnRemoval = false; }; + # get rid of stateVersion not set warning; + system.stateVersion = config.system.nixos.release; }; autoStart = false; enableTun = true; From 5911f86a5fb81cc91f04ba68080e720a9cc4a09d Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 17 Mar 2024 10:27:31 +0100 Subject: [PATCH 6/9] puyak.r: don't do news container --- krebs/1systems/puyak/config.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix index fb0f6ec61..60c1c941a 100644 --- a/krebs/1systems/puyak/config.nix +++ b/krebs/1systems/puyak/config.nix @@ -23,7 +23,6 @@ - ### shackspace ### # handle the worlddomination map via coap From 74cc0c4b638128a2bf3baeff620046edc50db2e3 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 17 Mar 2024 12:29:06 +0100 Subject: [PATCH 7/9] go: fix redis warning --- krebs/3modules/go.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/krebs/3modules/go.nix b/krebs/3modules/go.nix index 9dc8fe6d2..0c3f42f1c 100644 --- a/krebs/3modules/go.nix +++ b/krebs/3modules/go.nix @@ -20,9 +20,7 @@ let }; imp = { - services.redis = { - enable = true; - }; + services.redis.servers.go.enable = true; krebs.htgen.go = { port = cfg.port; From 8b101ed13697b06f40ee367941e6b654b6164c2c Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 17 Mar 2024 16:41:45 +0100 Subject: [PATCH 8/9] pkgs.reaktor2-plugins: remove trace --- krebs/5pkgs/simple/reaktor2-plugins.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/krebs/5pkgs/simple/reaktor2-plugins.nix b/krebs/5pkgs/simple/reaktor2-plugins.nix index b51b53a48..5b7be5d33 100644 --- a/krebs/5pkgs/simple/reaktor2-plugins.nix +++ b/krebs/5pkgs/simple/reaktor2-plugins.nix @@ -1,7 +1,7 @@ -{ lib, pkgs, stockholm, ... }: -with (builtins.trace (lib.attrNames stockholm) stockholm).lib; +{ pkgs, stockholm, ... }: +with stockholm.lib; -rec { +{ generators = { command_hook = commands: { pattern = From 593ae434b8a088f59340d6be595cd133b5b72908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Tue, 19 Mar 2024 19:58:27 +0100 Subject: [PATCH 9/9] kartei kmein: init fatteh --- kartei/kmein/default.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/kartei/kmein/default.nix b/kartei/kmein/default.nix index b096e2843..c840019b5 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 = [