feat: laptop change and smartphone add to authorized MACs

feat(networking): Add a bridge to connect VMs to the world
chore(krz01): Put all ollama/whisper stuff in separate modules
2024-10-17 21:18:40 +02:00 · 2024-10-17 17:56:09 +02:00 · 2024-10-17 15:47:10 +02:00 · 2024-10-17 15:34:11 +02:00 · 2024-10-17 15:11:43 +02:00 · 2024-10-17 15:11:43 +02:00
24 changed files with 383 additions and 339 deletions
--- a/machines/krz01/_configuration.nix
+++ b/machines/krz01/_configuration.nix
@ -1,11 +1,4 @@
-{
-  config,
-  lib,
-  pkgs,
-  meta,
-  name,
-  ...
-}:
+{ config, lib, ... }:

 lib.extra.mkConfig {
  enabledModules = [
@ -15,10 +8,13 @@ lib.extra.mkConfig {
  enabledServices = [
    # INFO: This list needs to stay sorted alphabetically
    # Machine learning API machine
-    "microvm-ml01"
-    "microvm-router01"
+    # "microvm-ml01"
+    # "microvm-router01"
    "nvidia-tesla-k80"
+    "ollama"
+    "whisper"
    "proxmox"
+    "networking"
  ];

  extraConfig = {
@ -33,46 +29,12 @@ lib.extra.mkConfig {
      ];
    };

-    services.netbird.enable = true;
-
    # We are going to use CUDA here.
    nixpkgs.config.cudaSupport = true;
    hardware.graphics.enable = true;
-    environment.systemPackages = [
-      ((pkgs.openai-whisper-cpp.override { cudaPackages = pkgs.cudaPackages_11; }).overrideAttrs (old: {
-        src = pkgs.fetchFromGitHub {
-          owner = "ggerganov";
-          repo = "whisper.cpp";
-          rev = "v1.7.1";
-          hash = "sha256-EDFUVjud79ZRCzGbOh9L9NcXfN3ikvsqkVSOME9F9oo=";
-        };
-        env = {
-          WHISPER_CUBLAS = "";
-          GGML_CUDA = "1";
-        };
-        # We only need Compute Capability 3.7.
-        CUDA_ARCH_FLAGS = [ "sm_37" ];
-        # We are GPU-only anyway.
-        patches = (old.patches or [ ]) ++ [
-          ./no-weird-microarch.patch
-          ./all-nvcc-arch.patch
-        ];
-      }))
-    ];

-    services = {
-      ollama = {
-        enable = true;
-        host = meta.network.${name}.netbirdIp;
-        package = pkgs.callPackage ./ollama.nix {
-          cudaPackages = pkgs.cudaPackages_11;
-          # We need to thread our nvidia x11 driver for CUDA.
-          extraLibraries = [ config.hardware.nvidia.package ];
-        };
-      };
-    };
-
-    networking.firewall.interfaces.wt0.allowedTCPPorts = [ config.services.ollama.port ];
+    services.netbird.enable = true;
+    networking.firewall.trustedInterfaces = [ "wt0" ];
  };

  root = ./.;
--- a/machines/krz01/networking.nix
+++ b/machines/krz01/networking.nix
@ -0,0 +1,22 @@
+{
+  systemd.networknetworks = {
+    "10-eno1" = {
+      matchConfig.Name = [ "eno1" ];
+      networkConfig = {
+        Bridge = "vmbr0";
+      };
+    };
+
+    "10-vmbr0" = {
+      matchConfig.Name = "vmbr0";
+      linkConfig.RequiredForOnline = "routable";
+    };
+  };
+
+  systemd.network.netdevs."vmbr0" = {
+    netdevConfig = {
+      Name = "vmbr0";
+      Kind = "bridge";
+    };
+  };
+}
--- a/machines/krz01/ollama/K80-support.patch
+++ b/machines/krz01/ollama/K80-support.patch
--- a/machines/krz01/ollama/all-nvcc-arch.patch
+++ b/machines/krz01/ollama/all-nvcc-arch.patch
--- a/machines/krz01/ollama/default.nix
+++ b/machines/krz01/ollama/default.nix
@ -0,0 +1,20 @@
+{
+  config,
+  pkgs,
+  meta,
+  name,
+  ...
+}:
+{
+  services = {
+    ollama = {
+      enable = true;
+      host = meta.network.${name}.netbirdIp;
+      package = pkgs.callPackage ./package.nix {
+        cudaPackages = pkgs.cudaPackages_11;
+        # We need to thread our nvidia x11 driver for CUDA.
+        extraLibraries = [ config.hardware.nvidia.package ];
+      };
+    };
+  };
+}
--- a/machines/krz01/ollama/disable-git.patch
+++ b/machines/krz01/ollama/disable-git.patch
--- a/machines/krz01/ollama/no-weird-microarch.patch
+++ b/machines/krz01/ollama/no-weird-microarch.patch
--- a/machines/krz01/ollama/package.nix
+++ b/machines/krz01/ollama/package.nix
--- a/machines/krz01/proxmox/default.nix
+++ b/machines/krz01/proxmox/default.nix
@ -1,14 +1,12 @@
-{ sources, lib, ... }:
+{ sources, ... }:
 let
  proxmox-nixos = import sources.proxmox-nixos;
 in
 {
  imports = [ proxmox-nixos.nixosModules.proxmox-ve ];
-  services.proxmox-ve.enable = true;
-  nixpkgs.overlays = [ proxmox-nixos.overlays.x86_64-linux ];
-  networking.firewall = {
-    trustedInterfaces = [ "wt0" ];
-    allowedTCPPorts = lib.mkForce [ 22 ];
+  services.proxmox-ve = {
+    enable = true;
+    openFirewall = false;
  };
-
+  nixpkgs.overlays = [ proxmox-nixos.overlays.x86_64-linux ];
 }
--- a/machines/krz01/whisper/all-nvcc-arch.patch
+++ b/machines/krz01/whisper/all-nvcc-arch.patch
@ -0,0 +1,26 @@
+From 2278389ef9ac9231349440aa68f9544ddc69cdc7 Mon Sep 17 00:00:00 2001
+From: Raito Bezarius <masterancpp@gmail.com>
+Date: Wed, 9 Oct 2024 13:37:08 +0200
+Subject: [PATCH] fix: sm_37 for nvcc
+
+Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 2ccb750..70dfd9b 100644
+--- a/Makefile
+++ b/Makefile
+@@ -537,7 +537,7 @@ endif #GGML_CUDA_NVCC
+ ifdef CUDA_DOCKER_ARCH
+ 	MK_NVCCFLAGS += -Wno-deprecated-gpu-targets -arch=$(CUDA_DOCKER_ARCH)
+ else ifndef CUDA_POWER_ARCH
+-	MK_NVCCFLAGS += -arch=native
+	MK_NVCCFLAGS += -arch=sm_37
+ endif # CUDA_DOCKER_ARCH
+ 
+ ifdef GGML_CUDA_FORCE_DMMV
+-- 
+2.46.0
+
--- a/machines/krz01/whisper/default.nix
+++ b/machines/krz01/whisper/default.nix
@ -0,0 +1,25 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = [
+    ((pkgs.openai-whisper-cpp.override { cudaPackages = pkgs.cudaPackages_11; }).overrideAttrs (old: {
+      src = pkgs.fetchFromGitHub {
+        owner = "ggerganov";
+        repo = "whisper.cpp";
+        rev = "v1.7.1";
+        hash = "sha256-EDFUVjud79ZRCzGbOh9L9NcXfN3ikvsqkVSOME9F9oo=";
+      };
+      env = {
+        WHISPER_CUBLAS = "";
+        GGML_CUDA = "1";
+      };
+      # We only need Compute Capability 3.7.
+      CUDA_ARCH_FLAGS = [ "sm_37" ];
+      # We are GPU-only anyway.
+      patches = (old.patches or [ ]) ++ [
+        ./no-weird-microarch.patch
+        ./all-nvcc-arch.patch
+      ];
+    }))
+  ];
+
+}
--- a/machines/krz01/whisper/no-weird-microarch.patch
+++ b/machines/krz01/whisper/no-weird-microarch.patch
@ -0,0 +1,34 @@
+From 51568b61ef63ecd97867562571411082c32751d3 Mon Sep 17 00:00:00 2001
+From: Raito Bezarius <masterancpp@gmail.com>
+Date: Wed, 9 Oct 2024 13:36:51 +0200
+Subject: [PATCH] fix: avx & f16c in Makefile
+
+Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
+---
+ Makefile | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 32b7cbb..2ccb750 100644
+--- a/Makefile
+++ b/Makefile
+@@ -361,12 +361,12 @@ ifndef RISCV
+ 
+ ifeq ($(UNAME_M),$(filter $(UNAME_M),x86_64 i686 amd64))
+ 	# Use all CPU extensions that are available:
+-	MK_CFLAGS     += -march=native -mtune=native
+-	HOST_CXXFLAGS += -march=native -mtune=native
+	# MK_CFLAGS     += -march=native -mtune=native
+	# HOST_CXXFLAGS += -march=native -mtune=native
+ 
+ 	# Usage AVX-only
+-	#MK_CFLAGS   += -mfma -mf16c -mavx
+-	#MK_CXXFLAGS += -mfma -mf16c -mavx
+	MK_CFLAGS   += -mf16c -mavx
+	MK_CXXFLAGS += -mf16c -mavx
+ 
+ 	# Usage SSSE3-only (Not is SSE3!)
+ 	#MK_CFLAGS   += -mssse3
+-- 
+2.46.0
+
--- a/machines/vault01/networking.nix
+++ b/machines/vault01/networking.nix
@ -239,7 +239,7 @@ in
          chain postrouting {
            type nat hook postrouting priority 100;
            ip saddr 10.0.0.0/16 ip saddr != 10.0.255.0/24 snat ip to 129.199.195.130-129.199.195.158
-            ether saddr e0:2b:e9:b5:b4:cc snat to 129.199.195.130 comment "Elias"
+            ether saddr { e0:2e:0b:bd:97:73, e8:d5:2b:0d:fe:4a } snat to 129.199.195.130 comment "Elias"
            ether saddr { 1c:1b:b5:14:9c:e5, e6:ce:e2:b6:e3:82 } snat to 129.199.195.131 comment "Lubin"
            ether saddr d0:49:7c:46:f6:39 snat to 129.199.195.132 comment "Jean-Marc"
            ether saddr { 5c:64:8e:f4:09:06 } snat to 129.199.195.158 comment "APs"
--- a/machines/web03/_configuration.nix
+++ b/machines/web03/_configuration.nix
@ -8,9 +8,12 @@ lib.extra.mkConfig {

  enabledServices = [
    # List of services to enable
+    "django-apps"
  ];

-  extraConfig = { };
+  extraConfig = {
+    services.netbird.enable = true;
+  };

  root = ./.;
 }
--- a/machines/web03/django-apps/default.nix
+++ b/machines/web03/django-apps/default.nix
@ -0,0 +1,15 @@
+{
+  imports = [ ./gestiojeux.nix ];
+
+  services.django-apps = {
+    enable = true;
+
+    webhook = {
+      domain = "hooks.webapps.dgnum.eu";
+      nginx = {
+        enableACME = true;
+        forceSSL = true;
+      };
+    };
+  };
+}
--- a/machines/web03/django-apps/gestiojeux.nix
+++ b/machines/web03/django-apps/gestiojeux.nix
@ -0,0 +1,69 @@
+{ pkgs, sources, ... }:
+
+let
+  nix-pkgs = import sources.nix-pkgs { inherit pkgs; };
+in
+
+{
+  services.django-apps.sites.gestiojeux = {
+    source = "https://git.dgnum.eu/DGNum/gestiojeux";
+    branch = "production";
+    domain = "gestiojeux.webapps.dgnum.eu";
+
+    nginx = {
+      enableACME = true;
+      forceSSL = true;
+    };
+
+    webHookSecret = builtins.toFile "insecure-secret" "T5hNeDraMivRZLUkrekv&QeM";
+
+    application = {
+      type = "wsgi";
+      module = "gestiojeux";
+    };
+
+    python = pkgs.python3.override {
+      packageOverrides = _: _: {
+        inherit (nix-pkgs)
+          django-autoslug
+          django-cas-ng
+          loadcredential
+          markdown-icons
+          ;
+      };
+    };
+
+    django = ps: ps.django_4;
+    dependencies = ps: [
+      ps.django-autoslug
+      ps.loadcredential
+      ps.django-cas-ng
+      ps.django-cleanup
+      ps.django-haystack
+      ps.django-markdownx
+      ps.django-tables2
+      ps.pillow
+      ps.psycopg2
+      ps.whoosh
+
+      # Django haystack is drunk
+      ps.setuptools
+    ];
+
+    staticDirectory = "source/public/static";
+    mediaDirectory = "source/public/media";
+
+    credentials = {
+      SECRET_KEY = builtins.toFile "insecure-key" "insecure-key";
+    };
+
+    environment = {
+      GESTIOJEUX_ALLOWED_HOSTS = [ "gestiojeux.webapps.dgnum.eu" ];
+      GESTIOJEUX_EMAIL_HOST_USER = "web-services@infra.dgnum.eu";
+      GESTIOJEUX_DEFAULT_FROM_EMAIL = "Kadenios <web-services@infra.dgnum.eu>";
+      GESTIOJEUX_SERVER_EMAIL = "webapps@infra.dgnum.eu";
+      GESTIOJEUX_DB_NAME = "dj-gestiojeux";
+      GESTIOJEUX_DB_USER = "dj-gestiojeux";
+    };
+  };
+}
--- a/meta/network.nix
+++ b/meta/network.nix
@ -31,7 +31,8 @@

  krz01 = {
    interfaces = {
-      eno1 = {
+      # see also machines/krz01/networking.nix
+      vmbr0 = {
        ipv4 = [
          {
            address = "129.199.146.21";
--- a/meta/nodes.nix
+++ b/meta/nodes.nix
@ -129,6 +129,8 @@

    hashedPassword = "$y$j9T$Un/tcX5SPKNXG.sy/BcTa.$kyNHELjb1GAOWnauJfcjyVi5tacWcuEBKflZDCUC6x4";

+    nix-modules = [ "services/django-apps" ];
+
    stateVersion = "24.05";
    nixpkgs = "24.05";
    vm-cluster = "Hyperviseur NPS";
--- a/modules/dgn-netbox-agent/netbox-agent
+++ b/modules/dgn-netbox-agent/netbox-agent
@ -1,46 +1,53 @@
 age-encryption.org/v1
-> ssh-ed25519 jIXfPA NUkF7lh+zUlEhOD+NEPL5g4VZiljYtL9dmRYXwIXuDU
-DLAlaC41tFIyuWa0Jj48PhVR+Z3FRv+/XVdxQsZwDSI
-> ssh-ed25519 QlRB9Q OZZomAuABy7/HE+mnxzKX2JKAtPfASCLeovOD8WPiSM
-9SzTBIziqCI3geAi5e8GwW5w+my6bTga3exjBFyg9Ek
-> ssh-ed25519 r+nK/Q QPepIFvtYrJmLiCZCB0UkQPeegGwl1YJt4+5KXxhr0c
-z1oacvWwv9zY1SoTEXQkCiglRp43Pod0qwId+1gk3ho
+-> ssh-ed25519 jIXfPA zyp8jIQ/BGlaOe2hCYdO2/jpiCJO/yASFn2v4yxF3XE
+tnajUOFI/LeiRRK2+XEmgAhU8PfyerYDPZ3CASAx6uE
+-> ssh-ed25519 QlRB9Q GTRAu+AUZ2MJs3ZaZR8GcS8U2xyGR0mx1FB78TmVhik
+PmenwNgQQUd6JWgUU1zmJWF+Lek4QwCKc0MzD/iLGUE
+-> ssh-ed25519 r+nK/Q 2cOo2pK5KN0keAbW62MaC0/wDysciEZPgY8+3vhx30s
+ZmjX2vi9qYOVWtctWcEt95l2kBlZH1uNLFUdUxSHyus
 -> ssh-rsa krWCLQ
-GJRazPf0i2LBvHGMzGxtWcCOAU+ftg893i869ZbunOdOeFHZHip5u0WHdsSYB8cU
-pRISjEONpGKbcZHEWNK9BDdEs/a7ysN4Jpl/2jRvqaNH21son2921d7KOLnpxRCx
-11UrPn6H6KedDhThGxPUFfZRuW9qePlyLLQo/W6N/y9wLQ1YXvmrvzDKeYsH5uZE
-NWdwcTCvkCDIvrc899wTUjDHeMEZ7HXM5sUTF0uCzuURDzXiDU0Fb0DpNckyHp+9
-mHV7JnE9hMb3cFKX0ICYWLdxQZ3gBb3GHiY7JWmk2CaYMEGnrFrGVTfXOeYyTRhp
-2iTIOvkJ0F7vhSseiJOPdw
-> ssh-ed25519 /vwQcQ 6RGiLik5D+yo5BYVZ6zsTOjAXVU4s+In06SSUwLO20Q
-9liiNqGLNu7yMoPN5UOWigj9svMdY6pFZPwyD6ykzxY
-> ssh-ed25519 0R97PA VTD/SyvWPXHXDqe6PztyOyngDeCjC/EvuGk0mdG27y0
-+B6MiMt5949O1rsVCU7PETDJ2xrX02cQwaCm65Jvp7w
-> ssh-ed25519 JGx7Ng kAbPiA0jJIr1cx861DHMJDM3dEWH/JErsVT3UheqNHQ
-eYTTBPu/h8SrpvDkbuvv4VkNDIuFlMnv46xupUgWKrE
-> ssh-ed25519 5SY7Kg f5D29L5Br9NxZBYeNYuIoLPWeKgdtqEJKgqy/ynKTw0
-7ym1s9hyo+Pd9O7kGcseafExd38uER+lOi8t8sP5o5c
-> ssh-ed25519 p/Mg4Q mMMcON4YC9xaNesoNnuhC8AmO8OYOXgXXalJbcbf/iI
-ls4IThQ7bZ7hmdZFwNvid+9sBWTQS+pHUkNa1NslmMc
-> ssh-ed25519 DqHxWQ RvGN0POhPDMrr6u9JeOCHp2MN7RUmKsPY9cpZ+k82yI
-LozUXuuVtQStR4duamN4HY7Kdiq2IoqRV1LWqU0cyfI
-> ssh-ed25519 tDqJRg LwZ+eTu8EIgV77YnrtXGPSY0aVZJbeJe4ejobtadAUM
-vITC+8MrHkmzJ0zMsk9AU+hcc+bwJ/ZPv6JXTuqUltw
-> ssh-ed25519 9pVK7Q oOySxJ2tO7ECQZEJC2UlUErVO4v7mPwIi2zn2FkPHB0
-oSw4tQY8492A/XZFsq+lfNowbiiZz2kgKAfJfVJ//jQ
-> ssh-ed25519 /BRpBQ XBfnufkT0rdvt3588w6xuVL5XK7VnLTNG0d+SBZ82mM
-jgtG4VDZaq5AI8/RoBp3XjMFsNNT7x7eQbdaLp9ycwU
-> ssh-ed25519 /x+F2Q aUwvBNo9iOYP4RhoH6SYSmSTZ8adGYZQdM+qC3UYnVM
-Kv0R/MIrEEamJzs9TLSI6PfbbaOqqKOT0lsZBcNmrXs
-> ssh-ed25519 +MNHsw 1aektirbIrnR6rq0UndczpXzS588bHcYINTJnvdNLyU
-he0QY7CWeQ+eGdJ/gqAI1m+pN7GlLeGEivAONt2BLak
-> ssh-ed25519 rHotTw OX9NgiDaBLqRC/DgLceOmZFrljgNfRywPeSAhZNlKG0
-0spiVg3+KYwoWONJf8ZaPDN59LImHxlzhypI8awovIw
-> ssh-ed25519 +mFdtQ Qya0JWuy8YhkkWYcJjwedHtVG8OTcplwaFwUfT3gGzM
-kaqko1aL2UE9rQbT5JfCJ+QtdBwCVvzNcL49Lk2UJ94
-> ssh-ed25519 0IVRbA Yajfo3uixZ9oJL/BGWzjkaF89moLHCqtgGhAAWc6d3Y
-qUz3pemzPRVOp7CNN/S09+56Fj/6bu1NZR0JTNwuIWk
-> ssh-ed25519 IY5FSQ KZGVezKb0D7M7N7ry2BpOb4Vh/RaNQR94JO8imFTvGM
-Et8UN82Ortb0nvP749hYrpwHR7CCcJ/cfw4MgchwUBM
--- h/4Bn/fiFPmNZYIDIRv2fQmZdOn6iDouzUf+ejfIdl4
-“ÙxŒ	û»6ïž—â?Jt°ý†èfüÜ†{Äf];•a-ì6p+Œ‹i;ìjªÖ…œ<E280A6>®ÏtÊ-¤3¯·Cezrì¼¹î	h¾—:œn’>j˜¡í»Û<15>ø]eç¿—%þš¬í´Ý‚
+xNCMgSxO8SA2rQqU14RD2TU5PQyssMlWomoA9VjoT6FsYZleRd7nPeABYqlnzUNj
+wWk3obSp3AO+NNscnmFrAijYQl0C+hBBplsgEyQ87j60s0ReAZGaURbrxRJr0dr/
+2JBrPtQ7tiSQYRZG9DH6ASUYrlVCB3Vq18OOa+os8PpqyL6Q6pglx0ePY1wx9irG
+6qj54LAR34C+uOi620LZuJ3YhZYIp0blmxqrXGeVTY1c7mmELKCdslFpiBvKE5jf
+71Lj6ihc5Z5kJxi0vPXMXkuGXtmlIr57dre2XWhynuXq9sLj0KEE0GVQa/vMV3Hd
+4/ATD4bbpkzwkfZIlL1LRQ
+-> ssh-ed25519 /vwQcQ 63EfH8Eu6Rdyz01sN7yfpaQpxJ2w4VqzQRWMw3AMSAk
+bj1CFYkCOcoMtuq/mC+vn9YM8aM9rLClcGo1rpytN7k
+-> ssh-ed25519 0R97PA gOIroiigdZxulsng29mz0o3gLYnMb5YjmBOmTd9UvHw
+mgvgYedm7U1y5BlRcvPEZhHpPEnczungDuBAEGcJwMw
+-> ssh-ed25519 JGx7Ng FeQyBpbGZ2WGztFXBpJ5uYXIPIEJqnf2FedleYRQJUc
+SzbinTIdwa1pvc9AZSWj2GRR86hD+SHY63QzBSv4D3I
+-> ssh-ed25519 5SY7Kg BgCKJrxjRS8QNCndIfySdq2u+hv3Q7Dg/hToWOE8e3g
+/rKzCb9fdZTEwTP1/QW4vn1ewQDn5TtV4Ui3MwChdB8
+-> ssh-ed25519 p/Mg4Q ftfpqvy3TuWoq+Hcmt+oYiJ1GhwYvR+GDh3MzVsfv3s
+I2dj0FSRGfoBqwSetdKz9NX11zUeHxIizmjctYrmjD8
+-> ssh-ed25519 DqHxWQ Zs+uNTp/4plSisoBzUpnvlZXLrbYphYvaeogHCyg4As
+hvXMQNPnJK7ZQrkYIyHW07rWd06QkNpiNuL3oUXxoQo
+-> ssh-ed25519 tDqJRg hMw/doebsExNtZ9oC1OFrnWOsiPOKh3D76RPfw0If00
+p5dxioeIt558deMFrRiTMxYocmP6p8kTk/nzSb5yuPA
+-> ssh-ed25519 9pVK7Q mctwqK3IkQdbeajO9mbvejtG85rFXTmFdptrzIzP9Cc
+sVG1NKMmTR0Sf60hvPJ4QRypmBT4a6yUZ+gyp/Xf+EQ
+-> ssh-ed25519 /BRpBQ C6CjF9H+x1fd2s4sjHw0IzKpNvbnr3H0tnxJdwzrzlQ
+gcrSM7NoHqeFdsTAWpO23cfAISile0uVEHu4fBvqwME
+-> ssh-ed25519 /x+F2Q t6mrvde1VJP7ARlwQAFOQxg6Uu2+GDDzN8GG/F/C5zA
+z3jOcIvHjH4TgiMHqABBU5t9bilBtv5rBKHJLMp9CaA
+-> ssh-ed25519 +MNHsw 5FBjw08c8F2wqrJe8KfWdn5bjzYmXXqLpVIozq8c8WE
+47oEgYMsl6/JtL1JqOOajHdB22gIdIGhhtcchUK7ZX4
+-> ssh-ed25519 rHotTw 4/W5DKJCc18KOcJQ1s4DveOVEjf5oy3HeQF5AThpvFM
+vG9LsTXTFk6TLHNDDS3qtirjm7iyZnhN+FM++xU0qGI
+-> ssh-ed25519 +mFdtQ bh0b+b2J2dg9hpBVYM3hDUwJOO/xi+dcH41abtVjt2E
+NPU1M+fXjOSROEWY73hftAniWUpr0ymbfo8mqZTPC/M
+-> ssh-ed25519 0IVRbA ioMW4UYJ+kKlZBdf430FHnbqdw3BcwWSr2RmOHCv+hA
+qw0VDAu93LSEZqhs9nRTCMGWsXKjxK65VfkKJbUU5fY
+-> ssh-ed25519 IY5FSQ 1aD4KWKITo+88CEwuTKq1QH+Pf5qoOXlI+EY2FX9IG4
+KzOGMeIxLypf7S6WeUM4Zr/S/g9HWXHBGcKkgHMLRJc
+-> ssh-ed25519 VQSaNw fCt2YDODTAtamSSYH+RNIpWAQ53WPwOeR92rHa89QBE
+2KAY4EgfxnNxvQGV4lgoGT+sb4nJV1eE50GHRljngEo
+-> x!p-grease Qza ,IU!}' (fMHX0~ m
+DGgaSNyr7o+hl8p9viIHBbTdiTdY79TgFsTdM2oBJAqT5P/LkFzg8TYNsH04eReH
+dmTu9wjN2OM
+--- +/E2Y1+KnzcreXm8DtJE39wR4dVL6vneloVFzK33c8Y
+T|ïá+¡ÆTÔŒÄ
+vÎ§“8»,OÔ¸lžÇ±z)/0<30>>hkJMèl	öÝ®GØßûGÜ>lU¯1Ÿ}€Š¤£T<C2A3>ÞhèÅý,åÎ8Åç%ßÓ¤lQ‰
+ëb©,@
--- a/modules/dgn-notify/mail
+++ b/modules/dgn-notify/mail
@ -1,46 +1,50 @@
 age-encryption.org/v1
-> ssh-ed25519 jIXfPA yR3cPS4s9FfwKAkXOoX1z9noWB76Dtp1GRHwltjHJGI
-Xm9BU7AhD4gQtHHhp/10Qf2q9hgk8mus2loreeycxd0
-> ssh-ed25519 QlRB9Q t+0hmPXKCm+lNnHzQtBWkenKqnPIxnf3qR05zFdtZww
-djP+WapwpCStUdL1pvpTR4aI6oj6SgookP7fluDLG44
-> ssh-ed25519 r+nK/Q BUsgW8EA2lk5i63114kH5G9bQ5uSJrsWBpktXIPIYTo
-DuxpBQqYFXq/bdtsezmGLPza+Y9GUMRhIsdF63IY9jc
+-> ssh-ed25519 jIXfPA zVe/xwQCEtVnX8qWShePzBmhfQbENRMn8XgPzEqb1gY
+CFa4qXtY8lBlSIxnWVbejVta8BFYmsCtp9TdXXexZYE
+-> ssh-ed25519 QlRB9Q 3EJeDSBkwJU2LaKHygG/a0tfFRXcp8SNJBxyhIOwBDU
+PI63A4YJFC1XTNPbl73SBlUMV25o0ZeojAr8tr5mtlY
+-> ssh-ed25519 r+nK/Q /4HQCHPBBk7lD2mwJOMEmTeRpPGnPgTcL+htNRvkxkk
+oXLQoX+AK8zn82wsnLHK4BOpK3gn5lThWiFXh8+rxUU
 -> ssh-rsa krWCLQ
-cyG9NELJZ6kHuXixzqrQgxi9Mi0I7322DsNS+jhAi7igHfc2ta6tNL0qNngmYaHI
-+eAO3+IPH4g8pd1tuP+YpRjvBAz0guPCOKMoDdHBDDkC3qTDr91D1zsZ7I/EgGa8
-0YXbHziCqlwo3W49rz+0lKBsz1gOH2UMrsEh6ZmFysvxiHdVxSwOkfqwmNpRMmiv
-zLjDmTSosP1DUEvd8ljHy/KFVgvoxGx6DB39vqg4+IaL62pkblbO+b0dj1rhxq9u
-iyOSc4G9laEB+umrvIhzbs+9r6tVwFqTIeauaNuKykhkWwq+3e3HYsUEzomMoxwE
-EhGpDVfVw/Tf9zUkfuBNdA
-> ssh-ed25519 /vwQcQ 71hXw3fsK7gvQNzNzHgJYXWVlQTkx7xvSKkZldoyNy4
-+HgmrnLrK+k/j/Fkn/e/pXfAMpuQz72hSmx8p8dN7ts
-> ssh-ed25519 0R97PA hm9JuJDRq7J3unX6vHPuM15FKV+C4ClETXkUIJcs9iI
-8zSV49d5JBojuvB4ob1/5l9oAnmIEF7qI+fum1Ypbic
-> ssh-ed25519 JGx7Ng jFGivHErkaUGpxIdgOmzbZDihBKDLjgy6pd9QxdpEUk
-U/GQwv6YZCqpVmBy05NPOn3Iy3S07hKz4+5uCfUzhM8
-> ssh-ed25519 5SY7Kg 5wLPRuunyDGAeh/cF46X24rQwlqoDbSkEowNE0Rz8BI
-qoriKBAeOA98oQEyaCICP1VyrOMxwsiWJRQ8oMFlFaM
-> ssh-ed25519 p/Mg4Q /lA5xli1c/nsYVsiGzbZg5QNpuTF/wVG0ByyWcoZQWM
-ikGP4kX1kxFyn/gui2H2YUgA7ph4N+j1ZZLIZp8RGe8
-> ssh-ed25519 DqHxWQ sPPbe/HX+ZMvTzP+IGYZlqUzGWdrw+5Fq+JenoxnMUI
-tel2fWk2B4To5KtdvS6vlQIAVvN+MeOHlBLMZpmaABQ
-> ssh-ed25519 tDqJRg /kVkNfR+SNGS6iOs185A5XwApB9DjjD4kIPnfka3IzA
-0h/svIu2/MCs1/i/X0qhGad59r8lJA+k16Luh/qN67M
-> ssh-ed25519 9pVK7Q wRzALhF6YWQBaxqtZoaPNtLAWXUcGhdeEorWXXWDRiY
-4ivHOIPeXs7YQoiKn0nEK2Q82PxDoulCrfVZhguOayc
-> ssh-ed25519 /BRpBQ dUJdnbTI/Rq2CkAlHnPDfSajTW93rLL4X6vJDgrGO08
-6itr9WBj0EiuKdyRuRM+4i+c+6DiFyBYI+COkvvPDSA
-> ssh-ed25519 /x+F2Q biQXbA1oZ3ujAw6Pwh5P4iUGNiFYI+R3r7KJrsikuQ4
-QZcrNLEbpki6KDW33TwVt84TwT58g6qcSlluZ5J0i1I
-> ssh-ed25519 +MNHsw vOgZMXC+tHWRVRpGwYxrR5C1Nrh0fCkRoNOjgTJHgHc
-dj0m2fbl4V2MUR8Uri4evfWolPoBKf5Rfg/0FjGmntc
-> ssh-ed25519 rHotTw wgphy9glZhVqnF+idQDFJ8crMbhuXnGcCU9iVT0dEgc
-sFoc7VjZHDMCBTJJ/fBvcVVxl72EcHeur8SSjeH26E0
-> ssh-ed25519 +mFdtQ pehvyrKd9oYpA5VWwN6DOJckooAMkpm7wSEAuVMjkRg
-oPWQRFBSLKU0Ic6+qudFzxnM3wggL4Y86zqWxc2p7kY
-> ssh-ed25519 0IVRbA iSgsYBbpWlAgUAGM9JNRqoZTOuEP3NMdmrKDReCXfSs
-Z+zHgn96/09FqhyJZmpCZBB4BHDE6P6/j8avd39I68k
-> ssh-ed25519 IY5FSQ qQOXJr6TkdwfGFgVe58QqpNjV1uzUPzuV6Vbc5jhnlg
-fdfonQACyNyJb4q5CgtTArqD4Ht6Cz/W+FWG+nNevvs
--- F7Ci+t2UpR0PkulLA9cJOjoTXO2GxjmPNX+Go2L9qB8
-Ä<š×]´D ìÕ¡²À÷H’Ç©ßAsö°&EàÙ¡°V0ýxRŠÜEÚáÐ±¦R¾eA#üÌ/{`Ø5.
+ox5TBB9buXII2U32S/XpQVdr3r87p9lt/7WwELq//ik7vf4B6mZPbYvIV05JZ5bO
+4f5khDdw+q1bbniDCBH2aPKM0ni3wBdLkT3jwdQBL5imSQuly/cFMdvVwSTuwN9k
+8smSavsUYK5q5xgE49oMYJBAhNVGFI7NKlx7/a3VaVybsLAnzp3AeWy1o5BB1fKT
+7Emt88ht4lymL/gyxSMLT5Dreb5Sm+AcE+gYAK92OnX4Z1k8FqETppTKZDuoZUmv
+hJPpylXw7/YJU7Q0CluwtcGWFaTuE6AT0IrlCdY3NuMGA9IfpVsZr1kocdq2qB02
+90/yy51Ulwhfhiy1/3mlfw
+-> ssh-ed25519 /vwQcQ SGCKP+4m5p9SiYnU3vL0QaKp/3+yztZ0snZ6os+mUAo
+ZEVgV6jo7tRdM1KxQJ2UJRDEYaiQy9PYzaeSAstHYFQ
+-> ssh-ed25519 0R97PA Bblz2DxUIBovbFqHhwGSRrs3Hbc1vNMtn8SK976YYAU
+FtEsqOUChH+uzFuTsATraNyyJXXdkesmbe8T+LeK9nU
+-> ssh-ed25519 JGx7Ng 3umTe7hK60ghA4fXbapBRjjJ9K6hXLfV5kQrBzwsmS8
+oRBFSJsVStw2ul6JxdJuan18GriwYF+d8asKXnWDpZA
+-> ssh-ed25519 5SY7Kg Ft714PG5dVVJWHu0aJh+wdT04vSb/vlDVsWmUhdjUXw
+qY7OJduSibFheBQOrGnSFUOhou/WyyY/M5tAYGvaTJI
+-> ssh-ed25519 p/Mg4Q u6ES8PpiDb1OY97sMQ/kL6sTIjBhDk1aqoIEd0I5BgA
+pbX1Wk+5aTbf5rU2JM0rf4SR/fJGLKcDcqLF1yDXbiE
+-> ssh-ed25519 DqHxWQ n8qHGzdwY1RfajPN+oZV0Ps44rqbW5tcUFSSPbyZmAw
+EAK0hA/94/ZxBz0iNaTl2RlpswiO+2eIWugozHrZZfw
+-> ssh-ed25519 tDqJRg RAEIORbyHLRNkm+mFsq07E1uzbEEIBQ3eG+kpyXLLG0
+1S7gL5WgXiFZxgH6kSp1zANafDTEKsC4Wo4kT8oB7b8
+-> ssh-ed25519 9pVK7Q p7tGHwbC3CWap6feMXq2twGHkyszLP0EKwhW4McAoj4
+7F0zZEON8H2H+v0XRCOiYeUuhJBRUVkFoEP+Cz4vHZo
+-> ssh-ed25519 /BRpBQ stXNcOvGwPBPz8TtLhQUVgpcvu4BtfUACAZtrEI0eGY
+FN2yFmvc3GhMGNTUCT+XMr1qsfLvmjHIkYoi5B3MDsE
+-> ssh-ed25519 /x+F2Q fmGbMAGFJbjR0zVdJqsigKQ28nbDq8Zx1FsgviLWqHc
+v09rkeHZTvFQLaXfOnFaZMBc2G2BD5dXWYg/Nlx2Og
+-> ssh-ed25519 +MNHsw KqIxZ4L1aoqLevCwx6Zp0jBHfTOU7WdrE0UN56/xARE
+OwQ2/WUEfl/oXxfbv5rlLu4OOdrACzPfSS6HfcLpi60
+-> ssh-ed25519 rHotTw hwCwUHi/xbAQaWt26kOn3/QSP0m0ZKRdIYs55TDMLSM
+DCvnBearzyPQ6ErYuawsyobpMsD9SSEhkVmFKyp5jUI
+-> ssh-ed25519 +mFdtQ ZlEsxLPDfy29aIQ9eNsRkZCHSeRmX8+GsuGtikQF4ms
+n1N2xQb4oRWaJgLtrXMFasc8u516e1M4Q/qLNLA0e0A
+-> ssh-ed25519 0IVRbA keVcQ4Vx3Avd97N89nUklRnGMABBenHIi+aufVoTABU
+yrsC1OitS6sqbUsaIaWeU8vYGOQm9afFfc6DprB8Whc
+-> ssh-ed25519 IY5FSQ npdYCAEfVSpuDNMZnWS469BgvivTKHRKtEAtxmxDZl8
+gOB1vpBO8ZqtLVwxCj8V/KrWgnYmZGn5QQJzMhiHH4A
+-> ssh-ed25519 VQSaNw S3dSnOPVQdMcz1dJYai0DvZATuMBDsG/+a0sJBDc/iE
+Q1gl1nIpDESMvTBX03i4lStAtdWqlTkVABHZ3cqocDE
+-> t-grease bvZAq
+NTQBWWf5UW4zsTEEt7rgmTv+B2rFIk/8WwQPrC/s59Ik
+--- 46n57xU0XlDQgUM0vIYveqDifz57FrTcRwCEpoh62+4
+[›07Æ~Þ3dïálÃÅô!f›ãš4ÐHßA‘‡íœ÷<C593>9
×ò@d»BÌ&½L‰{aãþm…X2ã’D‰Å´
--- a/modules/dgn-records/__arkheon-token_file
+++ b/modules/dgn-records/__arkheon-token_file
@ -1,46 +1,50 @@
 age-encryption.org/v1
-> ssh-ed25519 jIXfPA sHMGZvBA3KQ+vgyPRvthm7RrZv+cpA8rVaLMG11tWzc
-wb74jb8YFbu4hTaKECNpaCV5besptdBoXXstKd+eLTI
-> ssh-ed25519 QlRB9Q RILFFiLngUvfSPOmw6ZLmFLVyIIQqzib7LTV8hZP/w4
-na6S3iWEs3cxff30X59wD0SUNEP0/9LcuCyCUi7wgxg
-> ssh-ed25519 r+nK/Q Mtrr3NKJG1MBw150IZK1ZTKCglktIK8mV2M7FiLz9EQ
-zEEJwKeucMsZePFTZF/Cxfcuqn7KiSoBmBnNVKX1jAY
+-> ssh-ed25519 jIXfPA YaucboAId6lgc1Y/jV6hLyovkJQnMBnKhJ2QWAci53U
+Q8RUPu4GUC5QbzTROgL9xaG3BUWO1QU/q1p0/yimBQ0
+-> ssh-ed25519 QlRB9Q y1tbd/81NoECRtKwOw41Tlls5y+WSu2jGmeOlC939VM
+DT1zZgWJkkIWRWxzfu4VgiGpV8CioaDKnVemowH59N4
+-> ssh-ed25519 r+nK/Q dDmGkZ3Y7xAzZGKvGIyIdhD+P0tkV6SMPx3UxphoTXo
+tkanRbPfu3/cuMPoTrcWBlNcu6RmK+txif+9aIRLy+s
 -> ssh-rsa krWCLQ
-r3OX+AaSGO0zLoEAvAo3UrtWwU/Vjyfdp+qy4haB3tpl305I6Y6O6n2iHnc1PFgw
-qQ7Sa0GekbxNcwD7MzAmKbsm9wmnrF2hX03gFDI5isEPxaLC6ha207Ykauc2q1JC
-/SOZ/OUiizBUuO5OjywYz2AJUfEabmd+X1fw5QxAPSfp57KBZDJCGSpEDeJigU7M
-1n1XsT6eCyNDIIozRzIIyxLZU+tDDswjvjCaDJ/t2BE76LienwMRZK4P4tSn8DQP
-Jbm7bb5T2P1VAK4qIMP04DXQ861Kr2DvpLA/aPtHd9yMcZn5wQWMCVDgsL3ko0fU
-VThQwBW4qe59CCxA68TUcQ
-> ssh-ed25519 /vwQcQ KYM+4CPxNwxwh3liBBJYIqlWzpDO3h/dl54rEKQXGHU
-uteNJEqwLKUC3Gjm0BiRmb3uLb3bzRfpf3c1Da3vGjY
-> ssh-ed25519 0R97PA Sc9QAI4UNY6x0fZAoQOpUjzFzwev196x+7fjeIry3AU
-puUi8W0jCbMW3cN7PjoDM+vXnHjdQ2RLfX0kdpsaWhI
-> ssh-ed25519 JGx7Ng LzO5qvnVWhF3+cR4J3nJv9IB55/FYKillkJ2jKadfQA
-r3F+FKdpoKTB0/e5Vz5JFh9u8BKBOjn9XXE4dJEriuw
-> ssh-ed25519 5SY7Kg Uz/EgMgi0ACJStIvz06efUQpeU6VAuXVj+Veki0LkXA
-ukCkNIQMYbZBCBfd5R5dKWJwOcIKHzS9HN9CNk5iSF4
-> ssh-ed25519 p/Mg4Q 9+IsF8fUNcQhRxRddI6WQyKP8Ky0HV4jAUvS0ySDDwM
-7WamT/OA2Os6uE/hKzWkfjlwOKQpZ6j+fcgkvsk6wCY
-> ssh-ed25519 DqHxWQ WndaDm+ApRfFj+KL5cJgJqwaZXUYrXHpQ6AxDtGb5FY
-u5RHgWaY28QfA3jsD54PLR50Jl5KQyVpPv4CFhLPiYI
-> ssh-ed25519 tDqJRg Wgx7QpoPeendwBsWB+jAN5K+1uhxPsEHMugOPeC+Ono
-CRWVWTQB2eCVSKAwIzNNaWefAmniVtF5hu8xYeTGF0Q
-> ssh-ed25519 9pVK7Q kB5gWwwNNcCnjN5+1j7alWzqEgYMDQ3IvA8/0ltfLwo
-Tp7n6v/s4swKjOqEDKEKhM8agghKEvaz+zymG+b72f8
-> ssh-ed25519 /BRpBQ 6B5ODsRsRx8EIOrzBnAAw1bYsAQMvssSC1xxbAh+bGE
-Xmhe74XTMwfcGvk620XixhR/6GtOt2fynSMdJ7riZxs
-> ssh-ed25519 /x+F2Q /idVQW3v18G3e++zLmmcpZTvSW6YTfYKYX0xalx3DTU
-ybNKGMgW5ChQU2HXHfM0Od6GWC+HRKDemibhzi+NCA4
-> ssh-ed25519 +MNHsw +5EkjYR0CD0tF3jazvyz6WtzIG+84czuEsGzPmucOVI
-AqBXlugxP84nJ9jK1dPWWRJAAAzZjKl0RKd1+aXeIJg
-> ssh-ed25519 rHotTw IzGcfj5jNooeVt7+iJwnxUfka95NVEtE9dStQUt+gCE
-+lrjFHAgNOxI4JS6tGXcDSnbdn6/qwt2tI2WdVX2tO4
-> ssh-ed25519 +mFdtQ AieFjWmv27LvUbZXCBEqmvfTQM7SLXL12qIOzZLxdi8
-s0qzhUO2FDqr/w8B4cbnX8NuXfZM+nv4gj6SF0DreCY
-> ssh-ed25519 0IVRbA +S10pCaLByp+UrfbZXIIhMvUW79NPSSr5qHbm8Q8nxY
-fLU4Shu/luX9gLrJDM8rY+HRpHuuLKJAz0BSiLfXkj8
-> ssh-ed25519 IY5FSQ FJGXPcN7XjZTl3zc8iLSmc2IfhHx/xqIqnNz7j0dXGg
-D99jvNKh7yzafKB9qzOX6xNjhf3WS4bYBcc91dVX6Ow
--- USWnD/9XEj6tW0aHMZiVK1Guf43b/8wWcsafnVT0+h4
-RqÏHª,XHs8ÌÛÔtAbAGI<47>áÎ¤Â,åÖÝ¥¿è:<G=bFb†ÀTGSGäÊÙ	_
˜
+IZGpFoWjQuQzqkS2KbpVr+fP7NLPhyaxS4yQroVEkPEZnXx2c6eH3ul218zytZld
+YRBCxiCtV6VfOB2N2QGuiK7YCGl6oUfN1DePy0jPrGKsnvWBitTuqzADiGQB7aSI
+ie7GgblPpi4q3ovJPgf7Bs+Mi2dKW5hiD8Jnped7rEW7SEnESkQa3Cx22Ww/UYcW
+9Uj7ZaDVVbP0ZWyc41HdoJwEnV6MYMRnXUJ/qrLMCIvRaYk8UdiCDgco+XxqAnbs
+iyUqCvz8iVNsWbJxK+7jJHXp0dQJRciHzSGStIVRSGx4gvuXOGjsuBMjfwoq1XoR
+5PE3BnP/atHZg3CkQcC2eA
+-> ssh-ed25519 /vwQcQ WL0PdIIsSWzw+ar2QNXCp7Xs1NH9gUk2fSPskGC9o2I
+kHedFsYHgpsGfILtywJaIrTRj8HtHZvVyhtbRhKYC0
+-> ssh-ed25519 0R97PA +G7wUHF6NJimsAxe6M9RVVTa3GLPoW1bhsgMsWXKNC8
+i++lKoe8hFFb1rilkO9lcwBJujRqFsLGDOPvbaiz6Nw
+-> ssh-ed25519 JGx7Ng o66YGXN0uMC2qZo1tVcEMOa4SwxNZaf4HvnGsgzlqjo
+Tc4KMMrnJbybrNIkhEJz42PVHc3fVMFFSs96lKsEKCA
+-> ssh-ed25519 5SY7Kg P8Xp9wVJDcPdj3uSiq0yLnLMDInMeFs6XX30VwlXWlg
+uJfxXOZl8EX8fjRsHZ61JMKFpYksZJucZwVaRJs7qW8
+-> ssh-ed25519 p/Mg4Q yUyxue7Oda0b+CjdF9VfUCliWyzXNOsVPH7OFoHzWCw
+zi+TSojvSc+VDXZG8XXSsTezxKRNC2XHc/hGGv4baM
+-> ssh-ed25519 DqHxWQ 7Vnq/xidbguw/PkZPUOTHUBTe8/x4PvTjCusUe10jio
+7Sl1MptpElvEA9VUj7JiVGuEWC0F3aA2rgYvfIchOB0
+-> ssh-ed25519 tDqJRg udOCDV4/vszObNxcQhJ6iGiDkxgZlrBDyKt3MbibMx4
+CDDd0LNCCdYvEww/h8q2z4f5QtjnL+kJsnPFtlbiD28
+-> ssh-ed25519 9pVK7Q DXqkIewHGpUUDtL2ivAoFwY/HCjoQXjxoHGPGkuFfH0
+JZ7xC2kdtnRNq8WADL2SNw/Ukezu1s4TuUbQnbP8L4o
+-> ssh-ed25519 /BRpBQ 9j1+wzO733ej03ra8LQOkpOyvY63UCbO9sfT6bV6+zs
+2F0UjpAqgCK5JS0y0kkHX30EV8JCcjhnJ1NkW06ww4w
+-> ssh-ed25519 /x+F2Q wYchtMn7MCGllfiFwTrycdLEY3dl297ns26PHs7l320
+feRd57Z5k6iJ71JRHud0wyYWo3O56q4rrYZt5y3aoqA
+-> ssh-ed25519 +MNHsw FHfvx1FQWcsRlKrFF0SRcVZ+XG6LXBwIMcPCVeu/ZCg
+w9fZGhZpEJHlf8JPcbWcNoAO9S06hi15LZxkv1dJUWk
+-> ssh-ed25519 rHotTw QDcThfb0AJMQBfQDbbtqm6z7BGxC4/sBioprElUTXFA
+2JOFoMLcVhMoGzZDDNOTL3PBWsqVnrFx8o/W/cWuzl0
+-> ssh-ed25519 +mFdtQ tWg17VH1Q4gQj/1IK9yrxjw4kRPzsp4dDHFwDKYxvDE
+9H4ohD3XN4Xtk15SsZQf5k0db+yIVcWp4EV5jKsZgHI
+-> ssh-ed25519 0IVRbA rkMPsBgVEaiYtaBN5JzHNCPFYFKr/7dqoY+RX19+03o
+baQK5t5sG8WabaCuMTZ2ZIfMTRH0jQU4l7JEyJ6H+LU
+-> ssh-ed25519 IY5FSQ c1+2+CMJFMw/iF2XNx5ma28KhwdKKQ9dNC1nBvFz/B0
+3AE1FQq+//dNIQfuW9BHcpfNbGn724Ydq7aJc95KmmY
+-> ssh-ed25519 VQSaNw t9yLak0T7FO8hgGrPWFeR3Jw0D6cPxjR5LOIcMnAmgo
+869SBp0nM5v/9+Xjib6rkmmelhTBfXcyuHiAXh08AWo
+-> r32t]I\-grease ka<*
+nkxH0w1aQ64
+--- LlTR5EcQzCLJ5trkQcomW0+soQoec/IZZNW+g5dyOo0
+M"ÏLm“õh]ñÖa£uq±ýÏ4ßÏ+ö“9;Ð¤ˆÇ-Z±L»¯H0o1»Eâ<>
--- a/npins/sources.json
+++ b/npins/sources.json
@ -230,12 +230,6 @@
      "url": null,
      "hash": "1vy2dj9fyy653w6idvi1r73s0nd2a332a1xkppddjip6rk0i030p"
    },
-    "nixos-23.11": {
-      "type": "Channel",
-      "name": "nixos-23.11",
-      "url": "https://releases.nixos.org/nixos/23.11/nixos-23.11.7870.205fd4226592/nixexprs.tar.xz",
-      "hash": "1mbp7jydzxqgv9w3a8fqggq1x8h3cd0vh9wafri5pls52ngyww47"
-    },
    "nixos-24.05": {
      "type": "Channel",
      "name": "nixos-24.05",
@ -274,9 +268,9 @@
        "repo": "proxmox-nixos"
      },
      "branch": "main",
-      "revision": "7869ffc2e0db36f314fb60f1ab0087b760700b00",
-      "url": "https://github.com/SaumonNet/proxmox-nixos/archive/7869ffc2e0db36f314fb60f1ab0087b760700b00.tar.gz",
-      "hash": "0cam36s3ar366y41rvihjqghkdjl9a1n1wzym8p2mkar1r9x7haj"
+      "revision": "950e4cccac0f942076e8558f7f9f4d496cabfb18",
+      "url": "https://github.com/SaumonNet/proxmox-nixos/archive/950e4cccac0f942076e8558f7f9f4d496cabfb18.tar.gz",
+      "hash": "0bhqw42ydc0jfkfqw64xsg518a1pbxnvpqw92nna7lm8mzpxm6d4"
    },
    "signal-irc-bridge": {
      "type": "Git",
--- a/patches/05-pmnos-correctness-build-directory.patch
+++ b/patches/05-pmnos-correctness-build-directory.patch
@ -1,54 +0,0 @@
-From 4d6e57d2d577cc105c9e0cd397408e9e3ce85cd0 Mon Sep 17 00:00:00 2001
-From: Raito Bezarius <masterancpp@gmail.com>
-Date: Tue, 8 Oct 2024 16:33:14 +0200
-Subject: [PATCH] fix(packaging): correctness of the build top directory
-
-It was using /build which is an implementation detail and not
-guaranteed.
-
-Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
---
- pkgs/pve-container/default.nix | 6 +++---
- pkgs/pve-rs/default.nix        | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/pkgs/pve-container/default.nix b/pkgs/pve-container/default.nix
-index 445c271..5633c0f 100644
--- a/pkgs/pve-container/default.nix
-+++ b/pkgs/pve-container/default.nix
-@@ -30,7 +30,7 @@ perl536.pkgs.toPerlModule (
-     postPatch = ''
-       sed -i Makefile \
-         -e "s/pct.1 pct.conf.5 pct.bash-completion pct.zsh-completion //" \
-        -e "s,/usr/share/lxc,/build/lxc," \
-+        -e "s,/usr/share/lxc,$NIX_BUILD_TOP/lxc," \
-         -e "/pve-doc-generator/d" \
-         -e "/PVE_GENERATING_DOCS/d" \
-         -e "/SERVICEDIR/d" \
-@@ -45,8 +45,8 @@ perl536.pkgs.toPerlModule (
-     dontPatchShebangs = true;
- 
-     postConfigure = ''
-      cp -r ${lxc}/share/lxc /build
-      chmod -R +w /build/lxc
-+      cp -r ${lxc}/share/lxc $NIX_BUILD_TOP/
-+      chmod -R +w $NIX_BUILD_TOP/lxc
-     '';
- 
-     makeFlags = [
-diff --git a/pkgs/pve-rs/default.nix b/pkgs/pve-rs/default.nix
-index c024287..881beab 100644
--- a/pkgs/pve-rs/default.nix
-+++ b/pkgs/pve-rs/default.nix
-@@ -57,7 +57,7 @@ perl536.pkgs.toPerlModule (
-     ];
- 
-     makeFlags = [
-      "BUILDIR=/build"
-+      "BUILDIR=$NIX_BUILD_TOP"
-       "BUILD_MODE=release"
-       "DESTDIR=$(out)"
-       "GITVERSION:=${src.rev}"
-- 
-2.46.0
-
--- a/patches/default.nix
+++ b/patches/default.nix
@ -34,87 +34,6 @@ in
      path = ./04-crabfit-karla.patch;
    }
  ];
-  "nixos-23.11" = [
-    # netbox module
-    {
-      _type = "commit";
-      sha = "163fed297ed65a24241f190d8e954ce1877f9020";
-      includes = [ "nixos/modules/services/web-apps/netbox.nix" ];
-      hash = "sha256-mjeRxtZozgLNzHkCxcTs3xnonNPkmPoaGxawixC9jfo=";
-    }
-
-    # netbox qrcode plugin
-    {
-      _type = "commit";
-      sha = "ae4bf4c110378ebacb3989c9533726859cfebbfa";
-      hash = "sha256-SgHhW9HCkDQsxT3eG4P9q68c43e3sbDHRY9qs7oSt8o=";
-    }
-
-    netboxAgent
-
-    # missing jsonargparse deps for netbox-agent
-    {
-      # json arg parse dep: typesched-client
-      _type = "commit";
-      sha = "b1770afd23a7a1ebb4e5bccd8d34dfb3a58a4341";
-      hash = "sha256-PNUOPgmNFQr+bwG8MQiwlI4+zkDKLL3e1GgHHskX/Dk=";
-    }
-    {
-      # json arg parse dep: reconplogger
-      _type = "commit";
-      sha = "3835e47059eee32eaf5ef0eb03fce90e8c9b8ab4";
-      hash = "sha256-owJL1nmYfEXSHekBGgbJrTkl3OpX6dG9oq3mjN4Xgj8=";
-    }
-    {
-      # json arg parse dep: logmatic
-      _type = "commit";
-      sha = "b0de35af031b4282ac99919384f029a18704d819";
-      hash = "sha256-0nJzF2WMPNs2/zI65T1j9DQ0kORDKCu3H2PWjd/bXuo=";
-    }
-    {
-      # init at 4.27.2
-      _type = "commit";
-      sha = "aa724f81163725b54a06623d191de6d4c064c5ea";
-      hash = "sha256-ZWOVpVVsmjBCCiMe/j4YKz6YP4m5I8TTbqWNqBaMtKA=";
-    }
-    {
-      # 4.27.2 -> 4.27.3
-      id = "284460";
-      hash = "sha256-di9F8d5l0QDWt9yNpamHMyMm4AVxnsRko8+/Ruo7G3I=";
-    }
-    {
-      # 4.27.3 -> 4.27.4
-      id = "285873";
-      hash = "sha256-GRytcYvIsMP2RfHlmOJIH3po2/KmfZ3fDwo3YUyXGEU=";
-    }
-    {
-      # 4.27.4 -> 4.27.5
-      id = "288546";
-      hash = "sha256-iHXwZQKlaWmbd9kJbm6YyjIc3bPFHGbIghYRCPsSGHo=";
-    }
-    {
-      # 4.27.5 -> 4.27.6
-      id = "296359";
-      hash = "sha256-BHevlu8eqkoRgxwFMoS9bkT/9+w0Hfp3JXWh6UKovUk=";
-    }
-    {
-      # 4.27.6 -> 4.27.7
-      id = "297825";
-      hash = "sha256-tu91+T1G/sHfCLfLL4Jk/zLU/QwnHLbpxiYzRBJXFXw=";
-    }
-
-    # castopod: 1.6.4 -> 1.7.0 + ajout du support de loadcredentials
-    {
-      _type = "static";
-      path = ./01-castopod.patch;
-    }
-
-    # nixos/nextcloud: Rename autocreate (a no-op) to verify_bucket_exists
-    {
-      _type = "static";
-      path = ./03-nextcloud.patch;
-    }
-  ];

  "nixos-unstable" = [
    netboxAgent
@ -126,11 +45,4 @@ in
      hash = "sha256-SgHhW9HCkDQsxT3eG4P9q68c43e3sbDHRY9qs7oSt8o=";
    }
  ];
-
-  "proxmox-nixos" = [
-    {
-      _type = "static";
-      path = ./05-pmnos-correctness-build-directory.patch;
-    }
-  ];
 }
Author	SHA1	Message	Date
soyouzpanda	4d3d137929	feat: laptop change and smartphone add to authorized MACs	2024-10-17 21:18:40 +02:00
sinavir	3c445ab4c7	feat(networking): Add a bridge to connect VMs to the world	2024-10-17 17:56:09 +02:00
sinavir	492fe550d9	chore(krz01): Put all ollama/whisper stuff in separate modules	2024-10-17 15:47:10 +02:00
sinavir	a02da5f496	chore(proxmox-nixos): Update	2024-10-17 15:34:11 +02:00
Tom Hubrecht	b850ee56c2	chore(nixpkgs): Drop nixos-23.11	2024-10-17 15:11:43 +02:00
Tom Hubrecht	db5859e472	feat(web03): Initial deployment of django-apps	2024-10-17 15:11:43 +02:00
Tom Hubrecht	fd6b9678ef	chore(netbox-agent): Rekey	2024-10-17 15:06:26 +02:00
Tom Hubrecht	f771ec72c8	fix(secrets): Rekey Arkheon and email secrets	2024-10-16 11:45:50 +02:00