Compare commits

..
Author SHA1 Message Date
jschoubben 21f5301268 ombi: its config is placed, its image is the one ace runs
ombi's definition named /services/ombi/config (a HAL machine path) in three
places and pinned an image older than the one ace runs. Ombi migrates its
own SQLite schema, so a take onto the older pin (v4.53.10-ls267) would start
it on a database the newer build (ls269) already touched.

- config is a pathless placed directory, mounted as ${dir:config}
- a state directory placed at the assignment root carries route.json
- image pinned to the digest ace runs today (v4.53.10-ls269)
- the sidecar reaches ombi on the machine port the mesh assigns
  (${port:3579}) rather than assuming 3579 is free
- the sidecar no longer mounts ombi's data directory: MESH_OMBI_CONFIG_DIR
  is read by no code, and the mount exposed the databases for nothing

Verified: catalogue tests (MESH_CATALOGUE set, 6 pass, none skipped); the
pinned image starts as PUID 1000 in a 0700 dir and answers /api/v1/Status
200; data owned 1001:2000 (ace's media ids) under a 1000:1000 dir is
re-owned by the image's init and serves 200; a minted ApiKey is refused
(401) - the api-key secret must be accepted from ombi's own settings.
2026-09-29 23:38:56 +02:00
3 changed files with 33 additions and 117 deletions
+12 -9
View File
@@ -28,10 +28,15 @@
"path": "/var/lib/mesh/ombi",
"mode": "0700"
},
{
"id": "state",
"type": "directory",
"mode": "0700",
"place": "."
},
{
"id": "config",
"type": "directory",
"path": "/services/ombi/config",
"mode": "0700",
"owner": "1000:1000"
},
@@ -39,7 +44,7 @@
"id": "server",
"type": "container",
"name": "ombi",
"image": "lscr.io/linuxserver/ombi@sha256:a6f76ac521ba01eee2e9f0c23a3fed22e56630d97a04d5eeaeaa36c1e681640d",
"image": "lscr.io/linuxserver/ombi@sha256:22d6ebadbaaa728571353e74dc2173719e0fb02d4eaec551a7e9d2ee99ef68ac",
"env": {
"PUID": "1000",
"PGID": "1000",
@@ -49,7 +54,7 @@
"3579"
],
"volumes": [
"/services/ombi/config:/config"
"${dir:config}:/config"
]
},
{
@@ -68,15 +73,13 @@
"volumes": [
"/var/lib/mesh/ombi/broker:/run/secrets/broker:ro",
"/var/lib/mesh/ombi/api-key:/run/secrets/api-key:ro",
"/var/lib/mesh/ombi/config.json:/run/config/config.json:ro",
"/services/ombi/config:/var/lib/ombi/config:ro"
"/var/lib/mesh/ombi/config.json:/run/config/config.json:ro"
],
"env": {
"MESH_BROKER_FILE": "/run/secrets/broker",
"MESH_OMBI_URL": "http://127.0.0.1:3579",
"MESH_OMBI_URL": "http://127.0.0.1:${port:3579}",
"MESH_OMBI_API_KEY_FILE": "/run/secrets/api-key",
"MESH_OMBI_CONFIG_FILE": "/run/config/config.json",
"MESH_OMBI_CONFIG_DIR": "/var/lib/ombi/config"
"MESH_OMBI_CONFIG_FILE": "/run/config/config.json"
},
"restart-on": [
"runtime-config"
@@ -94,7 +97,7 @@
}
},
"binds": {
"route": "/var/lib/mesh/ombi/route.json"
"route": "${dir:state}/route.json"
},
"build": {
"on": [
+2 -4
View File
@@ -58,10 +58,8 @@ export class PlexClient {
static fromEnv(env: NodeJS.ProcessEnv = process.env): PlexClient {
const url = env.MESH_PLEX_URL ?? `http://127.0.0.1:${env.PLEX_PORT ?? "32400"}`;
const dataDir = env.MESH_PLEX_DATA_DIR ?? "/var/lib/plex";
// The manifest sets neither MESH_PLEX_TOKEN_FILE nor MESH_PLEX_TOKEN: the server already keeps its
// token in Preferences.xml, read here through the manifest's read-only mount of the config dir.
// A token the mesh minted would be one plex.tv never issued, and preferring it would break every
// call, so the module declares no token secret. The file and env overrides stay for hand runs.
// The operator-provided token is an own-secret the mesh mounts at MESH_PLEX_TOKEN_FILE (delivered
// by `secret accept`); prefer it, fall back to a bare env var, then to discovery from the data dir.
const token = readSecret(env.MESH_PLEX_TOKEN_FILE) ?? env.MESH_PLEX_TOKEN ?? PlexClient.detectToken(dataDir);
if (!token) throw new Error("no Plex token — set MESH_PLEX_TOKEN or make the data dir readable");
return new PlexClient(url, token);
+19 -104
View File
@@ -1,18 +1,6 @@
{
"module": "plex",
"version": "1",
"provides": [
{
"name": "plex-api",
"scope": "mesh"
}
],
"serves": {
"plex-api": {
"scheme": "http",
"port": 32400
}
},
"capabilities": [
"container-runtime"
],
@@ -25,7 +13,8 @@
"*.download.completed"
],
"own-secrets": {
"broker": "/var/lib/mesh/plex/broker"
"broker": "/var/lib/mesh/plex/broker",
"token": "/var/lib/mesh/plex/token"
},
"listens": [
{
@@ -33,35 +22,7 @@
"port": 32400,
"protocol": "tcp",
"from": "mesh",
"why": "the server itself: the apps, streaming and the web player, direct and through its route"
},
{
"name": "gdm-1",
"port": 32410,
"protocol": "udp",
"from": "mesh",
"why": "G'Day Mate discovery: players on the same network find the server without signing in"
},
{
"name": "gdm-2",
"port": 32412,
"protocol": "udp",
"from": "mesh",
"why": "G'Day Mate discovery"
},
{
"name": "gdm-3",
"port": 32413,
"protocol": "udp",
"from": "mesh",
"why": "G'Day Mate discovery"
},
{
"name": "gdm-4",
"port": 32414,
"protocol": "udp",
"from": "mesh",
"why": "G'Day Mate discovery"
"why": "streaming and the app; reaching it from outside is a route grant later"
}
],
"accesses": [
@@ -84,18 +45,6 @@
{
"path": "/services/media/audiobooks",
"mode": "read"
},
{
"path": "/services/media/sport-games",
"mode": "read"
},
{
"path": "/services/media/live-shows",
"mode": "read"
},
{
"path": "/services/media/formula-1",
"mode": "read"
}
],
"resources": [
@@ -105,63 +54,39 @@
"path": "/var/lib/mesh/plex",
"mode": "0700"
},
{
"id": "state",
"type": "directory",
"mode": "0700",
"place": "."
},
{
"id": "config",
"type": "directory",
"mode": "0755",
"owner": "1000:1000"
},
{
"id": "data",
"type": "directory",
"mode": "0755",
"path": "/services/plex/config",
"mode": "0700",
"owner": "1000:1000"
},
{
"id": "transcode",
"type": "directory",
"mode": "0755",
"path": "/services/plex/transcode",
"mode": "0700",
"owner": "1000:1000"
},
{
"id": "server-env",
"type": "file",
"path": "${dir:state}/server.env",
"mode": "0600",
"content": "ADVERTISE_IP=https://${bound:route:name}/\n"
},
{
"id": "server",
"type": "container",
"name": "plex",
"image": "plexinc/pms-docker@sha256:e0ab27395614a8e1a4fdf84c6bc60ac664915cfdde70c52d030c7728a1c48e14",
"image": "plexinc/pms-docker@sha256:83a425ae9e133b1cb2cc3b809556e01c61cd8ff65c582e41b4374bc2210bac9e",
"network": "host",
"env": {
"PLEX_UID": "1000",
"PLEX_GID": "1000",
"TZ": "Etc/UTC"
},
"env-file": [
"${dir:state}/server.env"
],
"volumes": [
"${dir:config}:/config",
"${dir:data}:/data",
"${dir:transcode}:/transcode",
"/services/media/movies:/movies:ro",
"/services/media/series:/series:ro",
"/services/media/anime:/anime:ro",
"/services/media/music:/music:ro",
"/services/media/audiobooks:/audiobooks:ro",
"/services/media/sport-games:/sport-games:ro",
"/services/media/live-shows:/live-shows:ro",
"/services/media/formula-1:/formula-1:ro"
"/services/plex/config:/config",
"/services/plex/transcode:/transcode",
"/services/media/movies:/movies",
"/services/media/series:/series",
"/services/media/anime:/anime",
"/services/media/music:/music",
"/services/media/audiobooks:/audiobooks"
]
},
{
@@ -171,28 +96,18 @@
"network": "host",
"volumes": [
"/var/lib/mesh/plex/broker:/run/secrets/broker:ro",
"${dir:config}:/var/lib/plex/config:ro"
"/var/lib/mesh/plex/token:/run/secrets/token:ro",
"/services/plex/config:/var/lib/plex/config:ro"
],
"env": {
"MESH_BROKER_FILE": "/run/secrets/broker",
"MESH_PLEX_URL": "http://127.0.0.1:${port:32400}",
"MESH_PLEX_URL": "http://127.0.0.1:32400",
"MESH_PLEX_TOKEN_FILE": "/run/secrets/token",
"MESH_PLEX_DATA_DIR": "/var/lib/plex"
},
"artifact": "runtime"
}
],
"requires": [
"route"
],
"contributes": {
"route": {
"label": "plex",
"endpoint": "stream"
}
},
"binds": {
"route": "${dir:state}/route.json"
},
"build": {
"on": [
{