infrastructure

commit e7f28b599104bff875e060bd610bd3cf801f391c
parent e13d8021cc4670c4f9dc60daad5106646d792e7c
Author: Silas Brack <silasbrack@gmail.com>
Date:   Sun,  7 Jun 2026 13:46:28 +0200

feat: restore simple-web-app and disable daily-tracker

Switch simple.fnarglebeast.com back to the simple-web-app service
and disable the daily-tracker.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Diffstat:
M
flake.lock
 | 
75
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
M
flake.nix
 | 
4
+++-
M
hosts/helios.nix
 | 
14
++++++++++++--

3 files changed, 89 insertions(+), 4 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -16,6 +16,21 @@
         "type": "gitlab"
       }
     },
+    "crane": {
+      "locked": {
+        "lastModified": 1776635034,
+        "narHash": "sha256-OEOJrT3ZfwbChzODfIH4GzlNTtOFuZFWPtW7jIeR8xU=",
+        "owner": "ipetkov",
+        "repo": "crane",
+        "rev": "dc7496d8ea6e526b1254b55d09b966e94673750f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ipetkov",
+        "repo": "crane",
+        "type": "github"
+      }
+    },
     "daily-tracker": {
       "inputs": {
         "nixpkgs": [
@@ -232,6 +247,22 @@
     },
     "nixpkgs_3": {
       "locked": {
+        "lastModified": 1776548001,
+        "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
         "lastModified": 1775888245,
         "narHash": "sha256-nwASzrRDD1JBEu/o8ekKYEXm/oJW6EMCzCRdrwcLe90=",
         "owner": "NixOS",
@@ -254,13 +285,55 @@
         "nixos-mailserver": "nixos-mailserver",
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-unstable": "nixpkgs-unstable",
+        "simple-web-app": "simple-web-app",
         "sops-nix": "sops-nix",
         "website": "website"
       }
     },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "simple-web-app",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1776654897,
+        "narHash": "sha256-Vqi4AiJVCcBGn/RmBtRCgyH5rCxqm/w0xV9diJWF1Ic=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "25d75be8139815a53560745fa060909777495105",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "simple-web-app": {
+      "inputs": {
+        "crane": "crane",
+        "nixpkgs": "nixpkgs_3",
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1777147695,
+        "narHash": "sha256-qYkrQPehfGzoWHMlVC9IG3U7xWOXUl93v6/KrEnjHJY=",
+        "ref": "refs/heads/main",
+        "rev": "ae4c3f76eef6a15a54860d6283eec80960e22651",
+        "revCount": 63,
+        "type": "git",
+        "url": "ssh://forgejo@git.fnarglebeast.com/silas/simple-web-app.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "ssh://forgejo@git.fnarglebeast.com/silas/simple-web-app.git"
+      }
+    },
     "sops-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
         "lastModified": 1777338324,
diff --git a/flake.nix b/flake.nix
@@ -3,6 +3,7 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     sops-nix.url = "github:Mic92/sops-nix";
+    simple-web-app.url = "git+ssh://forgejo@git.fnarglebeast.com/silas/simple-web-app.git";
     daily-tracker = {
       url = "git+ssh://forgejo@git.fnarglebeast.com/silas/daily-tracker.git";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -26,6 +27,7 @@
       nixpkgs,
       nixpkgs-unstable,
       sops-nix,
+      simple-web-app,
       daily-tracker,
       mkv,
       website,
@@ -56,7 +58,7 @@
               pkgs,
               ...
             }:
-            import ./hosts/helios.nix (inputs // { inherit daily-tracker mkv website; })
+            import ./hosts/helios.nix (inputs // { inherit simple-web-app daily-tracker mkv website; })
           )
         ];
       };
diff --git a/hosts/helios.nix b/hosts/helios.nix
@@ -2,6 +2,7 @@
   pkgs,
   config,
   lib,
+  simple-web-app,
   daily-tracker,
   mkv,
   website,
@@ -14,6 +15,7 @@
     ../modules/mediawiki.nix
     ../modules/forgejo.nix
     ../modules/mkv.nix
+    ../modules/simple-web-app.nix
     ../modules/daily-tracker.nix
     ../modules/mailserver.nix
   ];
@@ -116,11 +118,19 @@
     };
   };
 
+  # Simple Web App
+  services.simple-web-app = {
+    enable = true;
+    package = simple-web-app.packages.${pkgs.stdenv.hostPlatform.system}.default;
+    trailbasePackage = simple-web-app.packages.${pkgs.stdenv.hostPlatform.system}.trailbase;
+    traildepotPath = "${simple-web-app}/traildepot";
+  };
+
   # Daily Tracker
   services.local.daily-tracker = {
-    enable = true;
+    enable = false;
     package = daily-tracker.packages.${pkgs.stdenv.hostPlatform.system}.default;
-    domain = "simple.fnarglebeast.com";
+    domain = "daily-tracker.fnarglebeast.com";
     secretKeyBaseSecretName = "daily_tracker_secret_key_base";
     mailPasswordSecretName = "daily_tracker_mail_password";
   };