From db3e4b7f6e10b03ec0a54e7d2c096c53d269a265 Mon Sep 17 00:00:00 2001
From: revol-xut <revol-xut@protonmail.com>
Date: Sat, 14 Oct 2023 15:25:29 +0200
Subject: [PATCH] packaging kindergarten again with nix

---
 flake.lock                            | 48 ++++++++++++++++++++-------
 flake.nix                             | 10 +++++-
 modules/data-hoarder/chemo.nix        |  3 +-
 modules/data-hoarder/kindergarten.nix |  2 +-
 modules/data-hoarder/socket.nix       |  2 +-
 5 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/flake.lock b/flake.lock
index 801749b..35171d9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -425,6 +425,29 @@
         "type": "github"
       }
     },
+    "kindergarten": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "utils": [
+          "flake-utils"
+        ]
+      },
+      "locked": {
+        "lastModified": 1697289746,
+        "narHash": "sha256-iMz+PcLkIqT+rd9N5auVVMl0vwzAFXuyK2mkzglzXwk=",
+        "owner": "tlm-solutions",
+        "repo": "kindergarten",
+        "rev": "7d124018700465ae55a8ed5a55496853f9424ec3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tlm-solutions",
+        "repo": "kindergarten",
+        "type": "github"
+      }
+    },
     "lizard": {
       "inputs": {
         "crane": "crane_3",
@@ -459,11 +482,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1694526290,
-        "narHash": "sha256-HiWr+tfJE/hcn8atRC0S5KweSUknQLEduPLTEiSr5J8=",
+        "lastModified": 1697132997,
+        "narHash": "sha256-ihUImJsnszkSzxOd/iWkA/oorwsM8JaRFs6LS1831RM=",
         "owner": "astro",
         "repo": "microvm.nix",
-        "rev": "03e7f11cf915a911277c2cdea5d7da9717597aa2",
+        "rev": "38e15eee892e1866f483467de51025dbef473306",
         "type": "github"
       },
       "original": {
@@ -552,11 +575,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1693675694,
-        "narHash": "sha256-2pIOyQwGyy2FtFAUIb8YeKVmOCcPOTVphbAvmshudLE=",
+        "lastModified": 1696717752,
+        "narHash": "sha256-qEq1styCyQHSrw7AOhskH2qwCFx93bOwsGEzUIrZC0g=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5601118d39ca9105f8e7b39d4c221d3388c0419d",
+        "rev": "2f3b6b3fcd9fa0a4e6b544180c058a70890a7cc1",
         "type": "github"
       },
       "original": {
@@ -616,11 +639,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1694753796,
-        "narHash": "sha256-QPE7dqcicQH/nq9aywVXJWWtci4FvxHaM+BSIEbGBvA=",
+        "lastModified": 1696983906,
+        "narHash": "sha256-L7GyeErguS7Pg4h8nK0wGlcUTbfUMDu+HMf1UcyP72k=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "360a7d31c30abefdc490d203f80e3221b7a24af2",
+        "rev": "bd1cde45c77891214131cbbea5b1203e485a9d51",
         "type": "github"
       },
       "original": {
@@ -641,6 +664,7 @@
         "flake-utils": "flake-utils",
         "funnel": "funnel",
         "gnuradio-decoder": "gnuradio-decoder",
+        "kindergarten": "kindergarten",
         "lizard": "lizard",
         "microvm": "microvm",
         "naersk": "naersk_3",
@@ -808,11 +832,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1694495315,
-        "narHash": "sha256-sZEYXs9T1NVHZSSbMqBEtEm2PGa7dEDcx0ttQkArORc=",
+        "lastModified": 1697064251,
+        "narHash": "sha256-xxp2sB+4vqB6S6zC/L5J8LlRKgVbgIZOcYl9/TDrEzI=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "ea208e55f8742fdcc0986b256bdfa8986f5e4415",
+        "rev": "f995ea159252a53b25fa99824f2891e3b479d511",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 0656809..9ed9bc7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -43,6 +43,12 @@
       url = "github:tlm-solutions/datacare";
     };
 
+    kindergarten = {
+      url = "github:tlm-solutions/kindergarten";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.utils.follows = "flake-utils";
+    };
+
     telegram-decoder = {
       url = "github:tlm-solutions/telegram-decoder";
       inputs = {
@@ -106,6 +112,7 @@
     , documentation-src
     , funnel
     , gnuradio-decoder
+    , kindergarten
     , microvm
     , nixpkgs
     , sops-nix
@@ -135,6 +142,7 @@
         {
           nixpkgs.overlays = [
             datacare.overlays.default
+            kindergarten.overlays.default
             trekkie.overlays.default
             lizard.overlays.default
             bureaucrat.overlays.default
@@ -215,7 +223,7 @@
         }
         {
           id = 8;
-          arch ="aarch64-linux";
+          arch = "aarch64-linux";
           monitoring = false;
         }
       ];
diff --git a/modules/data-hoarder/chemo.nix b/modules/data-hoarder/chemo.nix
index a3ddd43..878beda 100644
--- a/modules/data-hoarder/chemo.nix
+++ b/modules/data-hoarder/chemo.nix
@@ -1,7 +1,8 @@
 { config, ... }:
 let
   service_number = 3;
-in {
+in
+{
   TLMS.chemo = {
     enable = true;
     host = "127.0.0.1";
diff --git a/modules/data-hoarder/kindergarten.nix b/modules/data-hoarder/kindergarten.nix
index 0393a2c..673c8a0 100644
--- a/modules/data-hoarder/kindergarten.nix
+++ b/modules/data-hoarder/kindergarten.nix
@@ -13,7 +13,7 @@
         enableACME = true;
         forceSSL = true;
         locations."~ ^/(de|en)" = {
-          root = "/var/lib/kindergarten/";
+          root = if (config.deployment-TLMS.domain == "tlm.solutions") then "${pkgs.kindergarten}/bin/" else "${pkgs.kindergarten-staging}/bin/";
           # index = "index.html";
           tryFiles = "$uri /$1/index.html =404";
           extraConfig = ''
diff --git a/modules/data-hoarder/socket.nix b/modules/data-hoarder/socket.nix
index d108a93..7473bc0 100644
--- a/modules/data-hoarder/socket.nix
+++ b/modules/data-hoarder/socket.nix
@@ -14,7 +14,7 @@ in
       port = 9000 + service_number;
     };
     metrics = {
-      port = 10010 + service_number ;
+      port = 10010 + service_number;
       host = config.deployment-TLMS.net.wg.addr4;
     };
   };