mosquitto: its directories are placed, not stated, and it runs the build in use

The module stated /var/lib/mosquitto-module and /services/mosquitto/data — novox's layout, a path no definition may carry (ADR 0112). State, grants and data are now placed directories (${dir:state}, ${dir:grants}, ${dir:data}), the admin secret lives beside the broker account under the mesh's own state, and the receives/grants maps follow the grants directory. Paths inside the sidecar are its own view and are unchanged. Image pinned to the 2.1.2 build ace's predecessor runs (2026-09-17); the old pin was the same version, built in June. Found preparing ace, whose broker carries a password-file user (an IoT switch and home-assistant). Carrying it is a data step, not a manifest one: the migration repo has scripts/mosquitto-pwdfile-to-dynsec.py, which moves $7$ PBKDF2 entries into the dynsec store hash-for-hash (tested end to end).
2026-09-29 23:05:41 +02:00
3 changed files with 25 additions and 59 deletions
@@ -23,13 +23,13 @@
    "mqtt-topic": {}
  },
  "receives": {
-    "mqtt-topic": "/var/lib/mosquitto-module/grants/mesh.json"
+    "mqtt-topic": "${dir:grants}/mesh.json"
  },
  "grants": {
-    "mqtt-topic": "/var/lib/mosquitto-module/grants"
+    "mqtt-topic": "${dir:grants}"
  },
  "own-secrets": {
-    "admin": "/var/lib/mosquitto-module/admin.secret",
+    "admin": "/var/lib/mesh/mosquitto/admin",
    "broker": "/var/lib/mesh/mosquitto/broker"
  },
  "listens": [
@@ -58,26 +58,24 @@
    {
      "id": "state",
      "type": "directory",
-      "path": "/var/lib/mosquitto-module",
-      "mode": "0700"
+      "mode": "0700",
+      "place": "."
    },
    {
-      "id": "grants-dir",
+      "id": "grants",
      "type": "directory",
-      "path": "/var/lib/mosquitto-module/grants",
      "mode": "0700"
    },
    {
      "id": "data",
      "type": "directory",
-      "path": "/services/mosquitto/data",
      "mode": "0700",
      "owner": "1883:1883"
    },
    {
      "id": "server-conf",
      "type": "file",
-      "path": "/var/lib/mosquitto-module/mosquitto.conf",
+      "path": "${dir:state}/mosquitto.conf",
      "mode": "0600",
      "owner": "1883:1883",
      "content": "persistence true\npersistence_location /mosquitto/data\n\nlog_dest stdout\nlog_type warning\nlog_type error\nlog_type notice\n\n# Every client authenticates; identities and their per-topic ACLs are managed\n# at runtime by the dynamic security plugin, whose store the plugin itself owns.\nallow_anonymous false\nplugin /usr/lib/mosquitto_dynamic_security.so\nplugin_opt_config_file /mosquitto/data/dynamic-security.json\n\n# MQTT listener\nlistener 1883\n\n# MQTT-over-WebSockets listener\nlistener 8081\nprotocol websockets\n"
@@ -93,8 +91,8 @@
      "name": "mosquitto-bootstrap",
      "run-once": true,
      "volumes": [
-        "/services/mosquitto/data:/mosquitto/data",
-        "/var/lib/mosquitto-module/admin.secret:/run/secrets/admin:ro"
+        "${dir:data}:/mosquitto/data",
+        "/var/lib/mesh/mosquitto/admin:/run/secrets/admin:ro"
      ],
      "env": {
        "MESH_PROVISION_MQTT": "mosquitto:1883",
@@ -112,15 +110,15 @@
      "id": "server",
      "type": "container",
      "name": "mosquitto",
-      "image": "eclipse-mosquitto@sha256:6f8d8a947c506f8a2290ec65cd4bd2bc7cb4d43fb5f6271f861cb013e2ef9797",
+      "image": "eclipse-mosquitto@sha256:38c0da4f2ef84284d47b3b3eeea1cb3bdeabe81ee10caf0cd5c5ff61ee3ea408",
      "network": "mosquitto",
      "ports": [
        "1883",
        "8081"
      ],
      "volumes": [
-        "/services/mosquitto/data:/mosquitto/data",
-        "/var/lib/mosquitto-module/mosquitto.conf:/mosquitto/config/mosquitto.conf:ro"
+        "${dir:data}:/mosquitto/data",
+        "${dir:state}/mosquitto.conf:/mosquitto/config/mosquitto.conf:ro"
      ]
    },
    {
@@ -130,8 +128,8 @@
      "network": "mosquitto",
      "volumes": [
        "/var/lib/mesh/mosquitto/broker:/run/secrets/broker:ro",
-        "/var/lib/mosquitto-module/grants:/var/lib/mosquitto-module/grants:ro",
-        "/var/lib/mosquitto-module/admin.secret:/run/secrets/admin:ro"
+        "${dir:grants}:/var/lib/mosquitto-module/grants:ro",
+        "/var/lib/mesh/mosquitto/admin:/run/secrets/admin:ro"
      ],
      "env": {
        "MESH_BROKER_FILE": "/run/secrets/broker",
@@ -41,32 +41,6 @@ function meshConfig(file?: string): Record<string, string> {
  catch { return {}; }
 }

-/**
- * The API key Tautulli minted for itself, read from its own config.ini (mounted read-only).
- *
- * Tautulli owns this key: it writes it on first run and every client of its API — this runtime
- * included — must present the same one. So the mesh does not mint or hold it; the one place it
- * lives is the file Tautulli keeps, and a key regenerated in Tautulli's settings is simply read
- * again on the next start. Undefined when there is no file or no key yet (a fresh install whose
- * setup wizard has not run).
- */
-function keyOfTautulli(dir?: string): string | undefined {
-  if (!dir) return undefined;
-  let ini: string;
-  try { ini = readFileSync(`${dir.replace(/\/$/, "")}/config.ini`, "utf8"); }
-  catch { return undefined; }
-  let section = "";
-  for (const raw of ini.split(/\r?\n/)) {
-    const line = raw.trim();
-    const header = /^\[(.+)\]$/.exec(line);
-    if (header) { section = header[1]; continue; }
-    if (section !== "General") continue;
-    const kv = /^api_key\s*=\s*"?([^"]*)"?$/.exec(line);
-    if (kv && kv[1]) return kv[1];
-  }
-  return undefined;
-}
-
 export class TautulliClient {
  readonly baseUrl: string;

@@ -78,16 +52,15 @@ export class TautulliClient {
  }

  /**
-   * Build from the module's resolved environment. The API key is the one Tautulli minted for
-   * itself (Settings → Web Interface), read from its config.ini under MESH_TAUTULLI_CONFIG_DIR;
-   * MESH_TAUTULLI_APIKEY still wins where it is set. The base URL defaults to the local container.
+   * Build from the module's resolved environment. The API key is read from MESH_TAUTULLI_APIKEY
+   * (Tautulli mints it in Settings → Web Interface); the base URL defaults to the local container.
   * Throws when no key is configured — the module then contributes nothing rather than failing.
   */
  static fromEnv(env: NodeJS.ProcessEnv = process.env): TautulliClient {
    const cfg = meshConfig(env.MESH_TAUTULLI_CONFIG_FILE);
    const url = cfg.url ?? (env.MESH_TAUTULLI_URL ?? `http://127.0.0.1:${env.TAUTULLI_PORT ?? "8181"}`);
-    const apiKey = cfg.apiKey ?? env.MESH_TAUTULLI_APIKEY ?? keyOfTautulli(env.MESH_TAUTULLI_CONFIG_DIR);
-    if (!apiKey) throw new Error("no Tautulli API key — Tautulli's config.ini has none yet (finish its setup and enable the API)");
+    const apiKey = cfg.apiKey ?? env.MESH_TAUTULLI_APIKEY;
+    if (!apiKey) throw new Error("no Tautulli API key — set MESH_TAUTULLI_APIKEY");
    return new TautulliClient(url, apiKey);
  }

@@ -16,7 +16,7 @@
      "port": 8181,
      "protocol": "tcp",
      "from": "mesh",
-      "why": "the watch statistics pages and API"
+      "why": "watch statistics"
    }
  ],
  "resources": [
@@ -26,15 +26,10 @@
      "path": "/var/lib/mesh/tautulli",
      "mode": "0700"
    },
-    {
-      "id": "state",
-      "type": "directory",
-      "mode": "0700",
-      "place": "."
-    },
    {
      "id": "config",
      "type": "directory",
+      "path": "/services/tautulli/config",
      "mode": "0700",
      "owner": "1000:1000"
    },
@@ -42,7 +37,7 @@
      "id": "server",
      "type": "container",
      "name": "tautulli",
-      "image": "lscr.io/linuxserver/tautulli@sha256:e35570d636471f8aabfac7044057712679f954844a763ba735baa9659ea142b5",
+      "image": "lscr.io/linuxserver/tautulli@sha256:13f03ecfc61a7af89d492677389771ac29682a72153ce08a5cd4faffbc0197e8",
      "env": {
        "PUID": "1000",
        "PGID": "1000",
@@ -52,7 +47,7 @@
        "8181"
      ],
      "volumes": [
-        "${dir:config}:/config"
+        "/services/tautulli/config:/config"
      ]
    },
    {
@@ -71,11 +66,11 @@
      "volumes": [
        "/var/lib/mesh/tautulli/broker:/run/secrets/broker:ro",
        "/var/lib/mesh/tautulli/config.json:/run/config/config.json:ro",
-        "${dir:config}:/var/lib/tautulli/config:ro"
+        "/services/tautulli/config:/var/lib/tautulli/config:ro"
      ],
      "env": {
        "MESH_BROKER_FILE": "/run/secrets/broker",
-        "MESH_TAUTULLI_URL": "http://127.0.0.1:${port:8181}",
+        "MESH_TAUTULLI_URL": "http://127.0.0.1:8181",
        "MESH_TAUTULLI_CONFIG_FILE": "/run/config/config.json",
        "MESH_TAUTULLI_CONFIG_DIR": "/var/lib/tautulli/config"
      },
@@ -95,7 +90,7 @@
    }
  },
  "binds": {
-    "route": "${dir:state}/route.json"
+    "route": "/var/lib/mesh/tautulli/route.json"
  },
  "build": {
    "on": [