jschoubben
8148678af8
bazarr reached sonarr and radarr as `sonarr:8989` and `radarr:7878`, container names on HAL's shared network, which the mesh does not have. It now requires sonarr-api and radarr-api (provided since #156) and a run-once step writes host, port, TLS, base path and key into bazarr through bazarr's own POST /api/system/settings - the call its settings screen makes - only for the fields that differ, and reads them back. bazarr's config.yaml is not written by the mesh: bazarr holds it in memory and rewrites it, so the two would overwrite each other. The key is tried against the app first; a refused key (a minted pair credential before the operator accepts the app's own) is never written, and the step fails naming the `secret accept` that fixes it. Declared last so its failing gates nothing else (ADR 0136); restart-on its four inputs. The api-key own-secret is gone. bazarr makes its own key and nothing lets the mesh set it, so a minted one could never work; the tools and the step read auth.apikey from bazarr's own config/config.yaml (mounted read-only), which also stays right if the key is regenerated. Nothing to accept. The config dir is a pathless ${dir:config}; config.json and the bindings live in a placed state dir; /var/lib/mesh/bazarr keeps only the broker. The image is pinned to the digest ace runs (v1.6.1-ls364); the old pin was v1.6.0-ls361, older than ace's database. Based on feat/servarr-api-provision (#156); this branch contains it. Verified: catalogue tests with MESH_CATALOGUE pass (not skipped); a resolve of sonarr+radarr+bazarr on a fake ace renders both bindings and sealed credentials into the state dir with every ${} filled, and bazarr alone is refused naming sonarr and radarr; strict tsc passes and the Dockerfile's non-strict compile builds; 8 node tests pass; the compiled step against the pinned image in a throwaway container with fake sonarr/radarr wrote sonarr (ip, port, apikey), refused radarr's minted key and wrote nothing for it, wrote radarr once the key was right, and changed nothing on a third run - the values landed in config.yaml.
182 lines
4.1 KiB
JSON
182 lines
4.1 KiB
JSON
{
|
|
"module": "bazarr",
|
|
"version": "1",
|
|
"capabilities": [
|
|
"container-runtime"
|
|
],
|
|
"emits": [
|
|
"subtitle.downloaded"
|
|
],
|
|
"own-secrets": {
|
|
"broker": "/var/lib/mesh/bazarr/broker"
|
|
},
|
|
"listens": [
|
|
{
|
|
"name": "web",
|
|
"port": 6767,
|
|
"protocol": "tcp",
|
|
"from": "mesh",
|
|
"why": "managing subtitles"
|
|
}
|
|
],
|
|
"accesses": [
|
|
{
|
|
"path": "/services/media/movies",
|
|
"mode": "read-write"
|
|
},
|
|
{
|
|
"path": "/services/media/series",
|
|
"mode": "read-write"
|
|
},
|
|
{
|
|
"path": "/services/media/anime",
|
|
"mode": "read-write"
|
|
},
|
|
{
|
|
"path": "/services/media/downloads",
|
|
"mode": "read"
|
|
}
|
|
],
|
|
"resources": [
|
|
{
|
|
"id": "mesh-state",
|
|
"type": "directory",
|
|
"path": "/var/lib/mesh/bazarr",
|
|
"mode": "0700"
|
|
},
|
|
{
|
|
"id": "state",
|
|
"type": "directory",
|
|
"mode": "0700",
|
|
"place": "."
|
|
},
|
|
{
|
|
"id": "config",
|
|
"type": "directory",
|
|
"mode": "0700",
|
|
"owner": "1000:1000"
|
|
},
|
|
{
|
|
"id": "server",
|
|
"type": "container",
|
|
"name": "bazarr",
|
|
"image": "lscr.io/linuxserver/bazarr@sha256:d24bd0048c759a468970989e9df11a6b96a7628d556d00f923e60a35ba59237b",
|
|
"env": {
|
|
"PUID": "1000",
|
|
"PGID": "1000",
|
|
"TZ": "Etc/UTC"
|
|
},
|
|
"ports": [
|
|
"6767"
|
|
],
|
|
"volumes": [
|
|
"${dir:config}:/config",
|
|
"/services/media/movies:/movies",
|
|
"/services/media/series:/series",
|
|
"/services/media/anime:/anime",
|
|
"/services/media/downloads:/downloads"
|
|
]
|
|
},
|
|
{
|
|
"id": "runtime-config",
|
|
"type": "file",
|
|
"path": "${dir:state}/config.json",
|
|
"mode": "0600",
|
|
"content": "{}\n",
|
|
"merge": "json"
|
|
},
|
|
{
|
|
"id": "runtime",
|
|
"type": "container",
|
|
"name": "mesh-bazarr",
|
|
"network": "host",
|
|
"volumes": [
|
|
"/var/lib/mesh/bazarr/broker:/run/secrets/broker:ro",
|
|
"${dir:state}/config.json:/run/config/config.json:ro",
|
|
"${dir:config}:/var/lib/bazarr/config:ro"
|
|
],
|
|
"env": {
|
|
"MESH_BROKER_FILE": "/run/secrets/broker",
|
|
"MESH_BAZARR_URL": "http://127.0.0.1:${port:6767}",
|
|
"MESH_BAZARR_CONFIG_FILE": "/run/config/config.json",
|
|
"MESH_BAZARR_CONFIG_DIR": "/var/lib/bazarr/config"
|
|
},
|
|
"restart-on": [
|
|
"runtime-config"
|
|
],
|
|
"artifact": "runtime"
|
|
},
|
|
{
|
|
"id": "servarr",
|
|
"type": "container",
|
|
"name": "mesh-bazarr-servarr",
|
|
"network": "host",
|
|
"run-once": true,
|
|
"volumes": [
|
|
"${dir:config}:/var/lib/bazarr/config:ro",
|
|
"${dir:state}/sonarr-api.json:/run/servarr/sonarr-api.json:ro",
|
|
"${dir:state}/sonarr-api.secret:/run/servarr/sonarr-api.secret:ro",
|
|
"${dir:state}/radarr-api.json:/run/servarr/radarr-api.json:ro",
|
|
"${dir:state}/radarr-api.secret:/run/servarr/radarr-api.secret:ro"
|
|
],
|
|
"env": {
|
|
"MESH_BAZARR_URL": "http://127.0.0.1:${port:6767}",
|
|
"MESH_BAZARR_CONFIG_DIR": "/var/lib/bazarr/config",
|
|
"MESH_SERVARR_DIR": "/run/servarr"
|
|
},
|
|
"args": [
|
|
"run",
|
|
"/app/modules/bazarr/dist/servarr/index.js"
|
|
],
|
|
"restart-on": [
|
|
"bound-sonarr-api",
|
|
"secret-sonarr-api",
|
|
"bound-radarr-api",
|
|
"secret-radarr-api"
|
|
],
|
|
"artifact": "runtime"
|
|
}
|
|
],
|
|
"requires": [
|
|
"radarr-api",
|
|
"route",
|
|
"sonarr-api"
|
|
],
|
|
"contributes": {
|
|
"route": {
|
|
"label": "subs",
|
|
"endpoint": "web"
|
|
}
|
|
},
|
|
"binds": {
|
|
"route": "${dir:state}/route.json",
|
|
"sonarr-api": "${dir:state}/sonarr-api.json",
|
|
"radarr-api": "${dir:state}/radarr-api.json"
|
|
},
|
|
"secrets": {
|
|
"sonarr-api": "${dir:state}/sonarr-api.secret",
|
|
"radarr-api": "${dir:state}/radarr-api.secret"
|
|
},
|
|
"build": {
|
|
"on": [
|
|
{
|
|
"arg": "BUILD_BASE",
|
|
"module": "mesh-tools",
|
|
"artifact": "build"
|
|
},
|
|
{
|
|
"arg": "RUNTIME_BASE",
|
|
"module": "mesh-tools",
|
|
"artifact": "runtime"
|
|
}
|
|
],
|
|
"artifacts": [
|
|
{
|
|
"name": "runtime",
|
|
"kind": "image",
|
|
"from": "Dockerfile"
|
|
}
|
|
]
|
|
}
|
|
}
|