Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4213fa7a2d | ||
|
|
8dcdd45660 |
File diff suppressed because one or more lines are too long
@@ -120,7 +120,7 @@
|
|||||||
"port": 7080,
|
"port": 7080,
|
||||||
"protocol": "tcp",
|
"protocol": "tcp",
|
||||||
"from": "mesh",
|
"from": "mesh",
|
||||||
"why": "the web front over http; only the ACME HTTP-01 passthrough is routed here — everything else 301s to https and would loop a proxy"
|
"why": "the web front over http; only the ACME HTTP-01 passthrough is routed here \u2014 everything else 301s to https and would loop a proxy"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "web-tls",
|
"name": "web-tls",
|
||||||
@@ -315,7 +315,10 @@
|
|||||||
"${dir:data-data}:/data",
|
"${dir:data-data}:/data",
|
||||||
"${dir:data-dkim}:/dkim"
|
"${dir:data-dkim}:/dkim"
|
||||||
],
|
],
|
||||||
"secrets-in-environment": "mailu-admin honours SECRET_KEY_FILE, DB_PW_FILE and API_TOKEN_FILE (configuration.py) but INITIAL_ADMIN_PW is env-only (start.py); the remaining containers' need for SECRET_KEY is unverified"
|
"secrets-in-environment": "mailu-admin honours SECRET_KEY_FILE, DB_PW_FILE and API_TOKEN_FILE (configuration.py) but INITIAL_ADMIN_PW is env-only (start.py); the remaining containers' need for SECRET_KEY is unverified",
|
||||||
|
"dns": [
|
||||||
|
"192.168.203.254"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "imap",
|
"id": "imap",
|
||||||
|
|||||||
@@ -58,8 +58,10 @@ export class PlexClient {
|
|||||||
static fromEnv(env: NodeJS.ProcessEnv = process.env): 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 url = env.MESH_PLEX_URL ?? `http://127.0.0.1:${env.PLEX_PORT ?? "32400"}`;
|
||||||
const dataDir = env.MESH_PLEX_DATA_DIR ?? "/var/lib/plex";
|
const dataDir = env.MESH_PLEX_DATA_DIR ?? "/var/lib/plex";
|
||||||
// The operator-provided token is an own-secret the mesh mounts at MESH_PLEX_TOKEN_FILE (delivered
|
// The manifest sets neither MESH_PLEX_TOKEN_FILE nor MESH_PLEX_TOKEN: the server already keeps its
|
||||||
// by `secret accept`); prefer it, fall back to a bare env var, then to discovery from the data dir.
|
// 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.
|
||||||
const token = readSecret(env.MESH_PLEX_TOKEN_FILE) ?? env.MESH_PLEX_TOKEN ?? PlexClient.detectToken(dataDir);
|
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");
|
if (!token) throw new Error("no Plex token — set MESH_PLEX_TOKEN or make the data dir readable");
|
||||||
return new PlexClient(url, token);
|
return new PlexClient(url, token);
|
||||||
|
|||||||
+104
-19
@@ -1,6 +1,18 @@
|
|||||||
{
|
{
|
||||||
"module": "plex",
|
"module": "plex",
|
||||||
"version": "1",
|
"version": "1",
|
||||||
|
"provides": [
|
||||||
|
{
|
||||||
|
"name": "plex-api",
|
||||||
|
"scope": "mesh"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"serves": {
|
||||||
|
"plex-api": {
|
||||||
|
"scheme": "http",
|
||||||
|
"port": 32400
|
||||||
|
}
|
||||||
|
},
|
||||||
"capabilities": [
|
"capabilities": [
|
||||||
"container-runtime"
|
"container-runtime"
|
||||||
],
|
],
|
||||||
@@ -13,8 +25,7 @@
|
|||||||
"*.download.completed"
|
"*.download.completed"
|
||||||
],
|
],
|
||||||
"own-secrets": {
|
"own-secrets": {
|
||||||
"broker": "/var/lib/mesh/plex/broker",
|
"broker": "/var/lib/mesh/plex/broker"
|
||||||
"token": "/var/lib/mesh/plex/token"
|
|
||||||
},
|
},
|
||||||
"listens": [
|
"listens": [
|
||||||
{
|
{
|
||||||
@@ -22,7 +33,35 @@
|
|||||||
"port": 32400,
|
"port": 32400,
|
||||||
"protocol": "tcp",
|
"protocol": "tcp",
|
||||||
"from": "mesh",
|
"from": "mesh",
|
||||||
"why": "streaming and the app; reaching it from outside is a route grant later"
|
"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"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"accesses": [
|
"accesses": [
|
||||||
@@ -45,6 +84,18 @@
|
|||||||
{
|
{
|
||||||
"path": "/services/media/audiobooks",
|
"path": "/services/media/audiobooks",
|
||||||
"mode": "read"
|
"mode": "read"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"path": "/services/media/sport-games",
|
||||||
|
"mode": "read"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"path": "/services/media/live-shows",
|
||||||
|
"mode": "read"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"path": "/services/media/formula-1",
|
||||||
|
"mode": "read"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"resources": [
|
"resources": [
|
||||||
@@ -54,39 +105,63 @@
|
|||||||
"path": "/var/lib/mesh/plex",
|
"path": "/var/lib/mesh/plex",
|
||||||
"mode": "0700"
|
"mode": "0700"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "state",
|
||||||
|
"type": "directory",
|
||||||
|
"mode": "0700",
|
||||||
|
"place": "."
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "config",
|
"id": "config",
|
||||||
"type": "directory",
|
"type": "directory",
|
||||||
"path": "/services/plex/config",
|
"mode": "0755",
|
||||||
"mode": "0700",
|
"owner": "1000:1000"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "data",
|
||||||
|
"type": "directory",
|
||||||
|
"mode": "0755",
|
||||||
"owner": "1000:1000"
|
"owner": "1000:1000"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "transcode",
|
"id": "transcode",
|
||||||
"type": "directory",
|
"type": "directory",
|
||||||
"path": "/services/plex/transcode",
|
"mode": "0755",
|
||||||
"mode": "0700",
|
|
||||||
"owner": "1000:1000"
|
"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",
|
"id": "server",
|
||||||
"type": "container",
|
"type": "container",
|
||||||
"name": "plex",
|
"name": "plex",
|
||||||
"image": "plexinc/pms-docker@sha256:83a425ae9e133b1cb2cc3b809556e01c61cd8ff65c582e41b4374bc2210bac9e",
|
"image": "plexinc/pms-docker@sha256:e0ab27395614a8e1a4fdf84c6bc60ac664915cfdde70c52d030c7728a1c48e14",
|
||||||
"network": "host",
|
"network": "host",
|
||||||
"env": {
|
"env": {
|
||||||
"PLEX_UID": "1000",
|
"PLEX_UID": "1000",
|
||||||
"PLEX_GID": "1000",
|
"PLEX_GID": "1000",
|
||||||
"TZ": "Etc/UTC"
|
"TZ": "Etc/UTC"
|
||||||
},
|
},
|
||||||
|
"env-file": [
|
||||||
|
"${dir:state}/server.env"
|
||||||
|
],
|
||||||
"volumes": [
|
"volumes": [
|
||||||
"/services/plex/config:/config",
|
"${dir:config}:/config",
|
||||||
"/services/plex/transcode:/transcode",
|
"${dir:data}:/data",
|
||||||
"/services/media/movies:/movies",
|
"${dir:transcode}:/transcode",
|
||||||
"/services/media/series:/series",
|
"/services/media/movies:/movies:ro",
|
||||||
"/services/media/anime:/anime",
|
"/services/media/series:/series:ro",
|
||||||
"/services/media/music:/music",
|
"/services/media/anime:/anime:ro",
|
||||||
"/services/media/audiobooks:/audiobooks"
|
"/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"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -96,18 +171,28 @@
|
|||||||
"network": "host",
|
"network": "host",
|
||||||
"volumes": [
|
"volumes": [
|
||||||
"/var/lib/mesh/plex/broker:/run/secrets/broker:ro",
|
"/var/lib/mesh/plex/broker:/run/secrets/broker:ro",
|
||||||
"/var/lib/mesh/plex/token:/run/secrets/token:ro",
|
"${dir:config}:/var/lib/plex/config:ro"
|
||||||
"/services/plex/config:/var/lib/plex/config:ro"
|
|
||||||
],
|
],
|
||||||
"env": {
|
"env": {
|
||||||
"MESH_BROKER_FILE": "/run/secrets/broker",
|
"MESH_BROKER_FILE": "/run/secrets/broker",
|
||||||
"MESH_PLEX_URL": "http://127.0.0.1:32400",
|
"MESH_PLEX_URL": "http://127.0.0.1:${port:32400}",
|
||||||
"MESH_PLEX_TOKEN_FILE": "/run/secrets/token",
|
|
||||||
"MESH_PLEX_DATA_DIR": "/var/lib/plex"
|
"MESH_PLEX_DATA_DIR": "/var/lib/plex"
|
||||||
},
|
},
|
||||||
"artifact": "runtime"
|
"artifact": "runtime"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"requires": [
|
||||||
|
"route"
|
||||||
|
],
|
||||||
|
"contributes": {
|
||||||
|
"route": {
|
||||||
|
"label": "plex",
|
||||||
|
"endpoint": "stream"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"binds": {
|
||||||
|
"route": "${dir:state}/route.json"
|
||||||
|
},
|
||||||
"build": {
|
"build": {
|
||||||
"on": [
|
"on": [
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -105,7 +105,7 @@
|
|||||||
"/var/lib/postgres/superuser.secret:/run/secrets/superuser:ro"
|
"/var/lib/postgres/superuser.secret:/run/secrets/superuser:ro"
|
||||||
],
|
],
|
||||||
"env": {
|
"env": {
|
||||||
"MESH_PROVISION_POSTGRES": "postgres://postgres@127.0.0.1:${port:5432}/postgres?sslmode=disable",
|
"MESH_PROVISION_POSTGRES": "postgres://postgres@127.0.0.1:5432/postgres?sslmode=disable",
|
||||||
"MESH_PROVISION_POSTGRES_PORT": "${seat:mesh-store:5432}",
|
"MESH_PROVISION_POSTGRES_PORT": "${seat:mesh-store:5432}",
|
||||||
"MESH_PROVISION_PASSWORD_FILE": "/run/secrets/superuser",
|
"MESH_PROVISION_PASSWORD_FILE": "/run/secrets/superuser",
|
||||||
"MESH_BROKER_FILE": "/run/secrets/broker",
|
"MESH_BROKER_FILE": "/run/secrets/broker",
|
||||||
|
|||||||
Reference in New Issue
Block a user