Update modules/server/containers/apps/influx.nix

modules/server/containers/apps/influx.nix

@@ -46,11 +46,11 @@ in {
         port = 8080;
         secret = name;
         extraEnv = {
-          SESSION_SECRET_KEY = "7b0024c13ae770000f797c201e2f210b9932a689c04d34de04379faa44e88e97";
           DATABASE_URL = "/db/sqlite.db"; 
+          DEFAULT_INFLUX_SERVER = "http://${builder.host}:8181";
         };
         overrides = {
-          ports = [ "8080:8080" ];
+          ports = [ "8888:8080" ];
           cmd = [ "--mode=admin" ]; 
           volumes = [
             "${serverCfg.path.data}/influxdb:/db:rw"
@@ -63,11 +63,11 @@ in {
     setup = {
       trigger = "server";
       script = pkgs.writeShellScript "setup" ''
-        cat > ${serverCfg.path.config}/influxdb/config.json << 'EOF'
+        cat > ${serverCfg.path.config}/influxdb/config/config.json << 'EOF'
 {
   "DEFAULT_INFLUX_SERVER": "http://${builder.host}:8181",
   "DEFAULT_INFLUX_DATABASE": "main",
-  "DEFAULT_API_TOKEN": "$INFLUXDB3_TOKEN",
+  "DEFAULT_API_TOKEN": "$INFLUXDB_TOKEN",
   "DEFAULT_SERVER_NAME": "${serverCfg.domain}"
 }
 EOF

modules/server/database/default.nix

@@ -5,6 +5,23 @@ let
   listNames = config.syscfg.server.db;
   containerNames = lib.concatMap (app: app.requires.databases) (builtins.attrValues config.syscfg.server.loadedContainers);
   allApps = lib.unique (listNames ++ containerNames);
+  influxAdminTokenJson = pkgs.writeShellScript "influxdb3-admin-token-json" ''
+    set -eu
+
+    token="''${INFLUXDB_TOKEN-''${INFLUXDB_TOKEN-}}"
+    if [ -z "$token" ]; then
+      echo "Missing INFLUXDB_TOKEN or INFLUXDB_TOKEN in ${config.sops.secrets."INFLUX".path}" >&2
+      exit 1
+    fi
+
+    cat > "$RUNTIME_DIRECTORY/admin-token.json" <<EOF
+{
+  "token": "$token",
+  "name": "admin",
+  "description": "Admin token for automated deployment"
+}
+EOF
+  '';
 in {
   config = lib.mkIf ( builtins.length allApps > 0) {
     services.postgresql = {
@@ -53,7 +70,10 @@ in {
       };
       serviceConfig = {
         Type = "simple";
-        ExecStart = "${pkgs.influxdb3}/bin/influxdb3 serve"; #--admin-token-file=/run/secrets/admin-token
+        EnvironmentFile = config.sops.secrets."INFLUX".path;
+        RuntimeDirectory = "influxdb3";
+        ExecStartPre = influxAdminTokenJson;
+        ExecStart = "${pkgs.influxdb3}/bin/influxdb3 serve --admin-token-file=%t/influxdb3/admin-token.json";
         Restart = "on-failure";
         StateDirectory = "influxdb3";
         PrivateTmp = true;
@@ -61,12 +81,6 @@ in {
       };
     };
 
-#   admin-token.json=  {
-#   "token": "$INFLUXDB_TOKEN",
-#   "name": "admin",
-#   "description": "Admin token for automated deployment"
-# }
-
 
     systemd.services.postgresql-init = {
       description = "Custom Postgres Setup (Ownership & Passwords)";