novox/mesh-catalog
3
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity

Merge pull request 'The mesh's own files for a module are placed by the mesh, not the definition (issue 174)' (#197) from feat/the-mesh-places-its-own-files into main

Browse Source
This commit was merged in pull request #197.
This commit is contained in:
mesh-admin
2026-09-30 21:49:11 +00:00
parent a724c0d82e 48850ebf90
commit 34ccc457fa
48 changed files with 275 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/anthropic-consumer/module.json
+4 -4
View File
@@ -15,7 +15,7 @@
"model-access": "${dir:state}/access-token" "model-access": "${dir:state}/access-token"
}, },
"own-secrets": { "own-secrets": {
"broker": "/var/lib/mesh/anthropic-consumer/broker" "broker": "${dir:mesh-state}/broker"
}, },
"emits": [ "emits": [
"usage.session" "usage.session"
@@ -24,8 +24,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/anthropic-consumer", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "state", "id": "state",
@@ -76,7 +76,7 @@
"/app/modules/anthropic-consumer/dist/usage/index.js" "/app/modules/anthropic-consumer/dist/usage/index.js"
], ],
"volumes": [ "volumes": [
"/var/lib/mesh/anthropic-consumer/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"${dir:state}:/run/state" "${dir:state}:/run/state"
], ],
"env": { "env": {
modules/anthropic-manager/module.json
+8 -8
View File
@@ -9,13 +9,13 @@
"model-access" "model-access"
], ],
"binds": { "binds": {
"model-access": "/var/lib/mesh/anthropic-manager/model.json" "model-access": "${dir:mesh-state}/model.json"
}, },
"secrets": { "secrets": {
"model-access": "/var/lib/mesh/anthropic-manager/refresh-token" "model-access": "${dir:mesh-state}/refresh-token"
}, },
"own-secrets": { "own-secrets": {
"broker": "/var/lib/mesh/anthropic-manager/broker" "broker": "${dir:mesh-state}/broker"
}, },
"emits": [ "emits": [
"usage.read" "usage.read"
@@ -24,13 +24,13 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/anthropic-manager", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "out", "id": "out",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/anthropic-manager/out", "path": "${dir:mesh-state}/out",
"mode": "0700" "mode": "0700"
}, },
{ {
@@ -45,8 +45,8 @@
"/app/modules/anthropic-manager/dist/refresh/index.js" "/app/modules/anthropic-manager/dist/refresh/index.js"
], ],
"volumes": [ "volumes": [
"/var/lib/mesh/anthropic-manager/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"/var/lib/mesh/anthropic-manager:/run/state" "${dir:mesh-state}:/run/state"
], ],
"env": { "env": {
"MESH_BROKER_FILE": "/run/secrets/broker", "MESH_BROKER_FILE": "/run/secrets/broker",
modules/baserow/module.json
+6 -6
View File
@@ -26,7 +26,7 @@
}, },
"own-secrets": { "own-secrets": {
"admin": "${dir:state}/admin.secret", "admin": "${dir:state}/admin.secret",
"broker": "/var/lib/mesh/baserow/broker" "broker": "${dir:mesh-state}/broker"
}, },
"listens": [ "listens": [
{ {
@@ -41,8 +41,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/baserow", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "state", "id": "state",
@@ -88,7 +88,7 @@
{ {
"id": "runtime-config", "id": "runtime-config",
"type": "file", "type": "file",
"path": "/var/lib/mesh/baserow/config.json", "path": "${dir:mesh-state}/config.json",
"mode": "0600", "mode": "0600",
"content": "{\n \"password\": \"${secret:admin}\",\n \"host\": \"${bound:route:name}\"\n}\n", "content": "{\n \"password\": \"${secret:admin}\",\n \"host\": \"${bound:route:name}\"\n}\n",
"merge": "json" "merge": "json"
@@ -99,8 +99,8 @@
"name": "mesh-baserow", "name": "mesh-baserow",
"network": "baserow", "network": "baserow",
"volumes": [ "volumes": [
"/var/lib/mesh/baserow/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"/var/lib/mesh/baserow/config.json:/run/config/config.json:ro" "${dir:mesh-state}/config.json:/run/config/config.json:ro"
], ],
"env": { "env": {
"MESH_BROKER_FILE": "/run/secrets/broker", "MESH_BROKER_FILE": "/run/secrets/broker",
modules/bazarr/module.json
+9 -9
View File
@@ -8,8 +8,8 @@
"subtitle.downloaded" "subtitle.downloaded"
], ],
"own-secrets": { "own-secrets": {
"broker": "/var/lib/mesh/bazarr/broker", "broker": "${dir:mesh-state}/broker",
"api-key": "/var/lib/mesh/bazarr/api-key" "api-key": "${dir:mesh-state}/api-key"
}, },
"listens": [ "listens": [
{ {
@@ -42,8 +42,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/bazarr", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "config", "id": "config",
@@ -76,7 +76,7 @@
{ {
"id": "runtime-config", "id": "runtime-config",
"type": "file", "type": "file",
"path": "/var/lib/mesh/bazarr/config.json", "path": "${dir:mesh-state}/config.json",
"mode": "0600", "mode": "0600",
"content": "{}\n", "content": "{}\n",
"merge": "json" "merge": "json"
@@ -87,9 +87,9 @@
"name": "mesh-bazarr", "name": "mesh-bazarr",
"network": "host", "network": "host",
"volumes": [ "volumes": [
"/var/lib/mesh/bazarr/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"/var/lib/mesh/bazarr/api-key:/run/secrets/api-key:ro", "${dir:mesh-state}/api-key:/run/secrets/api-key:ro",
"/var/lib/mesh/bazarr/config.json:/run/config/config.json:ro", "${dir:mesh-state}/config.json:/run/config/config.json:ro",
"/services/bazarr/config:/var/lib/bazarr/config:ro" "/services/bazarr/config:/var/lib/bazarr/config:ro"
], ],
"env": { "env": {
@@ -115,7 +115,7 @@
} }
}, },
"binds": { "binds": {
"route": "/var/lib/mesh/bazarr/route.json" "route": "${dir:mesh-state}/route.json"
}, },
"build": { "build": {
"on": [ "on": [
modules/bookshelf/module.json
+5 -5
View File
@@ -11,7 +11,7 @@
], ],
"consumes": [], "consumes": [],
"own-secrets": { "own-secrets": {
"broker": "/var/lib/mesh/bookshelf/broker" "broker": "${dir:mesh-state}/broker"
}, },
"listens": [ "listens": [
{ {
@@ -36,8 +36,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/bookshelf", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "config", "id": "config",
@@ -71,7 +71,7 @@
"name": "mesh-bookshelf", "name": "mesh-bookshelf",
"network": "host", "network": "host",
"volumes": [ "volumes": [
"/var/lib/mesh/bookshelf/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"/services/bookshelf/config:/var/lib/bookshelf/config:ro" "/services/bookshelf/config:/var/lib/bookshelf/config:ro"
], ],
"env": { "env": {
@@ -92,7 +92,7 @@
} }
}, },
"binds": { "binds": {
"route": "/var/lib/mesh/bookshelf/route.json" "route": "${dir:mesh-state}/route.json"
}, },
"build": { "build": {
"on": [ "on": [
modules/builder/module.json
+8 -8
View File
@@ -15,20 +15,20 @@
"npm-package-registry" "npm-package-registry"
], ],
"binds": { "binds": {
"npm-package-registry": "/var/lib/mesh/builder/package-registry.json" "npm-package-registry": "${dir:mesh-state}/package-registry.json"
}, },
"secrets": { "secrets": {
"npm-package-registry": "/var/lib/mesh/builder/package-registry.secret" "npm-package-registry": "${dir:mesh-state}/package-registry.secret"
}, },
"own-secrets": { "own-secrets": {
"broker": "/var/lib/mesh/builder/broker" "broker": "${dir:mesh-state}/broker"
}, },
"resources": [ "resources": [
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/builder", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "workspace", "id": "workspace",
@@ -38,7 +38,7 @@
{ {
"id": "builder-env", "id": "builder-env",
"type": "file", "type": "file",
"path": "/var/lib/mesh/builder/builder.env", "path": "${dir:mesh-state}/builder.env",
"mode": "0600", "mode": "0600",
"content": "MESH_BROKER_FILE=/run/mesh/broker\nMESH_NODE=${machine:name}\nMESH_REGISTRY=${bound:artifact-store:at}:${bound:artifact-store:port}\nMESH_PACKAGE_BINDING=/run/mesh/package-registry.json\nMESH_NPM_TOKEN_FILE=/run/mesh/package-registry.secret\nMESH_WORKSPACE=${dir:workspace}\n" "content": "MESH_BROKER_FILE=/run/mesh/broker\nMESH_NODE=${machine:name}\nMESH_REGISTRY=${bound:artifact-store:at}:${bound:artifact-store:port}\nMESH_PACKAGE_BINDING=/run/mesh/package-registry.json\nMESH_NPM_TOKEN_FILE=/run/mesh/package-registry.secret\nMESH_WORKSPACE=${dir:workspace}\n"
}, },
@@ -48,10 +48,10 @@
"name": "mesh-builder", "name": "mesh-builder",
"artifact": "server", "artifact": "server",
"env-file": [ "env-file": [
"/var/lib/mesh/builder/builder.env" "${dir:mesh-state}/builder.env"
], ],
"volumes": [ "volumes": [
"/var/lib/mesh/builder:/run/mesh:ro", "${dir:mesh-state}:/run/mesh:ro",
"${dir:workspace}:${dir:workspace}", "${dir:workspace}:${dir:workspace}",
"/var/run/docker.sock:/var/run/docker.sock" "/var/run/docker.sock:/var/run/docker.sock"
], ],
modules/cloudflare-dns/module.json
+4 -4
View File
@@ -19,7 +19,7 @@
}, },
"own-secrets": { "own-secrets": {
"token": "${dir:state}/token", "token": "${dir:state}/token",
"broker": "/var/lib/mesh/cloudflare-dns/broker" "broker": "${dir:mesh-state}/broker"
}, },
"emits": [ "emits": [
"record.created", "record.created",
@@ -29,8 +29,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/cloudflare-dns", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "state", "id": "state",
@@ -60,7 +60,7 @@
"${dir:state}/config.json:/run/config/config.json:ro", "${dir:state}/config.json:/run/config/config.json:ro",
"${dir:grants}:/grants", "${dir:grants}:/grants",
"${dir:state}/token:/run/secrets/token:ro", "${dir:state}/token:/run/secrets/token:ro",
"/var/lib/mesh/cloudflare-dns/broker:/run/secrets/broker:ro" "${dir:mesh-state}/broker:/run/secrets/broker:ro"
], ],
"env": { "env": {
"MESH_CLOUDFLARE_TOKEN_FILE": "/run/secrets/token", "MESH_CLOUDFLARE_TOKEN_FILE": "/run/secrets/token",
modules/confluence/module.json
+4 -4
View File
@@ -4,14 +4,14 @@
"slug": "confl", "slug": "confl",
"own-secrets": { "own-secrets": {
"token": "${dir:state}/token", "token": "${dir:state}/token",
"broker": "/var/lib/mesh/confluence/broker" "broker": "${dir:mesh-state}/broker"
}, },
"resources": [ "resources": [
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/confluence", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "state", "id": "state",
@@ -35,7 +35,7 @@
"volumes": [ "volumes": [
"${dir:state}/config.json:/run/config/config.json:ro", "${dir:state}/config.json:/run/config/config.json:ro",
"${dir:state}/token:/run/secrets/token:ro", "${dir:state}/token:/run/secrets/token:ro",
"/var/lib/mesh/confluence/broker:/run/secrets/broker:ro" "${dir:mesh-state}/broker:/run/secrets/broker:ro"
], ],
"env": { "env": {
"MESH_CONFLUENCE_TOKEN_FILE": "/run/secrets/token", "MESH_CONFLUENCE_TOKEN_FILE": "/run/secrets/token",
modules/dnsmasq/module.json
+3 -3
View File
@@ -12,7 +12,7 @@
"name.removed" "name.removed"
], ],
"own-secrets": { "own-secrets": {
"broker": "/var/lib/mesh/dnsmasq/broker" "broker": "${dir:mesh-state}/broker"
}, },
"claims": [ "claims": [
{ {
@@ -42,8 +42,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/dnsmasq", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "package", "id": "package",
modules/gitea/module.json
+8 -8
View File
@@ -86,19 +86,19 @@
} }
], ],
"own-secrets": { "own-secrets": {
"broker": "/var/lib/mesh/gitea/broker" "broker": "${dir:mesh-state}/broker"
}, },
"resources": [ "resources": [
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/gitea", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "runtime-state", "id": "runtime-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/gitea/state", "path": "${dir:mesh-state}/state",
"mode": "0700" "mode": "0700"
}, },
{ {
@@ -175,7 +175,7 @@
{ {
"id": "runtime-config", "id": "runtime-config",
"type": "file", "type": "file",
"path": "/var/lib/mesh/gitea/config.json", "path": "${dir:mesh-state}/config.json",
"mode": "0600", "mode": "0600",
"content": "{}\n", "content": "{}\n",
"merge": "json" "merge": "json"
@@ -186,11 +186,11 @@
"name": "mesh-gitea", "name": "mesh-gitea",
"network": "host", "network": "host",
"volumes": [ "volumes": [
"/var/lib/mesh/gitea/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"/var/lib/mesh/gitea/config.json:/run/config/config.json:ro", "${dir:mesh-state}/config.json:/run/config/config.json:ro",
"${dir:grants}:${dir:grants}:ro", "${dir:grants}:${dir:grants}:ro",
"${dir:state}/admin.secret:/run/secrets/admin:ro", "${dir:state}/admin.secret:/run/secrets/admin:ro",
"/var/lib/mesh/gitea/state:/run/state" "${dir:runtime-state}:/run/state"
], ],
"env": { "env": {
"MESH_BROKER_FILE": "/run/secrets/broker", "MESH_BROKER_FILE": "/run/secrets/broker",
modules/gitlab/module.json
+4 -4
View File
@@ -3,14 +3,14 @@
"version": "1", "version": "1",
"own-secrets": { "own-secrets": {
"token": "${dir:state}/token", "token": "${dir:state}/token",
"broker": "/var/lib/mesh/gitlab/broker" "broker": "${dir:mesh-state}/broker"
}, },
"resources": [ "resources": [
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/gitlab", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "state", "id": "state",
@@ -34,7 +34,7 @@
"volumes": [ "volumes": [
"${dir:state}/config.json:/run/config/config.json:ro", "${dir:state}/config.json:/run/config/config.json:ro",
"${dir:state}/token:/run/secrets/token:ro", "${dir:state}/token:/run/secrets/token:ro",
"/var/lib/mesh/gitlab/broker:/run/secrets/broker:ro" "${dir:mesh-state}/broker:/run/secrets/broker:ro"
], ],
"env": { "env": {
"MESH_GITLAB_TOKEN_FILE": "/run/secrets/token", "MESH_GITLAB_TOKEN_FILE": "/run/secrets/token",
modules/grafana/module.json
+9 -9
View File
@@ -5,8 +5,8 @@
"alert.firing" "alert.firing"
], ],
"own-secrets": { "own-secrets": {
"admin": "/var/lib/mesh/grafana/admin", "admin": "${dir:mesh-state}/admin",
"broker": "/var/lib/mesh/grafana/broker" "broker": "${dir:mesh-state}/broker"
}, },
"capabilities": [ "capabilities": [
"container-runtime" "container-runtime"
@@ -24,8 +24,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/grafana", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "state", "id": "state",
@@ -108,7 +108,7 @@
{ {
"id": "runtime-config", "id": "runtime-config",
"type": "file", "type": "file",
"path": "/var/lib/mesh/grafana/config.json", "path": "${dir:mesh-state}/config.json",
"mode": "0600", "mode": "0600",
"content": "{\n \"user\": \"admin\",\n \"password\": \"${secret:admin}\"\n}\n", "content": "{\n \"user\": \"admin\",\n \"password\": \"${secret:admin}\"\n}\n",
"merge": "json" "merge": "json"
@@ -119,8 +119,8 @@
"name": "mesh-grafana", "name": "mesh-grafana",
"network": "host", "network": "host",
"volumes": [ "volumes": [
"/var/lib/mesh/grafana/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"/var/lib/mesh/grafana/config.json:/run/config/config.json:ro" "${dir:mesh-state}/config.json:/run/config/config.json:ro"
], ],
"env": { "env": {
"MESH_BROKER_FILE": "/run/secrets/broker", "MESH_BROKER_FILE": "/run/secrets/broker",
@@ -158,8 +158,8 @@
"influxdb-api": "${dir:state}/influxdb.json" "influxdb-api": "${dir:state}/influxdb.json"
}, },
"secrets": { "secrets": {
"oidc-client": "/var/lib/mesh/grafana/oidc-client", "oidc-client": "${dir:mesh-state}/oidc-client",
"influxdb-api": "/var/lib/mesh/grafana/influxdb-api" "influxdb-api": "${dir:mesh-state}/influxdb-api"
}, },
"build": { "build": {
"on": [ "on": [
modules/home-assistant/module.json
+9 -9
View File
@@ -9,8 +9,8 @@
"state.changed" "state.changed"
], ],
"own-secrets": { "own-secrets": {
"broker": "/var/lib/mesh/home-assistant/broker", "broker": "${dir:mesh-state}/broker",
"token": "/var/lib/mesh/home-assistant/token" "token": "${dir:mesh-state}/token"
}, },
"listens": [ "listens": [
{ {
@@ -39,8 +39,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/home-assistant", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "state", "id": "state",
@@ -74,7 +74,7 @@
{ {
"id": "runtime-config", "id": "runtime-config",
"type": "file", "type": "file",
"path": "/var/lib/mesh/home-assistant/config.json", "path": "${dir:mesh-state}/config.json",
"mode": "0600", "mode": "0600",
"content": "{}\n", "content": "{}\n",
"merge": "json" "merge": "json"
@@ -85,9 +85,9 @@
"name": "mesh-home-assistant", "name": "mesh-home-assistant",
"network": "host", "network": "host",
"volumes": [ "volumes": [
"/var/lib/mesh/home-assistant/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"/var/lib/mesh/home-assistant/token:/run/secrets/token:ro", "${dir:mesh-state}/token:/run/secrets/token:ro",
"/var/lib/mesh/home-assistant/config.json:/run/config/config.json:ro" "${dir:mesh-state}/config.json:/run/config/config.json:ro"
], ],
"env": { "env": {
"MESH_BROKER_FILE": "/run/secrets/broker", "MESH_BROKER_FILE": "/run/secrets/broker",
@@ -107,7 +107,7 @@
"network": "host", "network": "host",
"run-once": true, "run-once": true,
"volumes": [ "volumes": [
"/var/lib/mesh/home-assistant/token:/run/secrets/token:ro", "${dir:mesh-state}/token:/run/secrets/token:ro",
"${dir:written}:/var/lib/home-assistant-provisions", "${dir:written}:/var/lib/home-assistant-provisions",
"${dir:state}/mqtt-topic.json:/run/provisions/mqtt-topic.json:ro", "${dir:state}/mqtt-topic.json:/run/provisions/mqtt-topic.json:ro",
"${dir:state}/mqtt-topic.secret:/run/provisions/mqtt-topic.secret:ro", "${dir:state}/mqtt-topic.secret:/run/provisions/mqtt-topic.secret:ro",
modules/icecast/module.json
+6 -6
View File
@@ -29,7 +29,7 @@
"stream.stopped" "stream.stopped"
], ],
"own-secrets": { "own-secrets": {
"broker": "/var/lib/mesh/icecast/broker" "broker": "${dir:mesh-state}/broker"
}, },
"listens": [ "listens": [
{ {
@@ -44,8 +44,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/icecast", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "state", "id": "state",
@@ -91,7 +91,7 @@
{ {
"id": "runtime-config", "id": "runtime-config",
"type": "file", "type": "file",
"path": "/var/lib/mesh/icecast/config.json", "path": "${dir:mesh-state}/config.json",
"mode": "0600", "mode": "0600",
"content": "{}\n", "content": "{}\n",
"merge": "json" "merge": "json"
@@ -102,8 +102,8 @@
"name": "mesh-icecast", "name": "mesh-icecast",
"network": "icecast", "network": "icecast",
"volumes": [ "volumes": [
"/var/lib/mesh/icecast/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"/var/lib/mesh/icecast/config.json:/run/config/config.json:ro" "${dir:mesh-state}/config.json:/run/config/config.json:ro"
], ],
"env": { "env": {
"MESH_BROKER_FILE": "/run/secrets/broker", "MESH_BROKER_FILE": "/run/secrets/broker",
modules/influxdb/module.json
+6 -6
View File
@@ -11,7 +11,7 @@
"container-runtime" "container-runtime"
], ],
"own-secrets": { "own-secrets": {
"broker": "/var/lib/mesh/influxdb/broker", "broker": "${dir:mesh-state}/broker",
"admin": "${dir:state}/admin.secret", "admin": "${dir:state}/admin.secret",
"admin-token": "${dir:state}/admin-token.secret" "admin-token": "${dir:state}/admin-token.secret"
}, },
@@ -42,8 +42,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/influxdb", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "state", "id": "state",
@@ -96,7 +96,7 @@
{ {
"id": "runtime-config", "id": "runtime-config",
"type": "file", "type": "file",
"path": "/var/lib/mesh/influxdb/config.json", "path": "${dir:mesh-state}/config.json",
"mode": "0600", "mode": "0600",
"content": "{}\n", "content": "{}\n",
"merge": "json" "merge": "json"
@@ -107,8 +107,8 @@
"name": "mesh-influxdb", "name": "mesh-influxdb",
"network": "host", "network": "host",
"volumes": [ "volumes": [
"/var/lib/mesh/influxdb/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"/var/lib/mesh/influxdb/config.json:/run/config/config.json:ro", "${dir:mesh-state}/config.json:/run/config/config.json:ro",
"${dir:state}/admin-token.secret:/run/secrets/admin-token:ro", "${dir:state}/admin-token.secret:/run/secrets/admin-token:ro",
"${dir:grants}:${dir:grants}:ro" "${dir:grants}:${dir:grants}:ro"
], ],
modules/invoicing/module.json
+2 -2
View File
@@ -54,8 +54,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/invoicing", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "state", "id": "state",
modules/jira/module.json
+4 -4
View File
@@ -3,14 +3,14 @@
"version": "1", "version": "1",
"own-secrets": { "own-secrets": {
"token": "${dir:state}/token", "token": "${dir:state}/token",
"broker": "/var/lib/mesh/jira/broker" "broker": "${dir:mesh-state}/broker"
}, },
"resources": [ "resources": [
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/jira", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "state", "id": "state",
@@ -34,7 +34,7 @@
"volumes": [ "volumes": [
"${dir:state}/config.json:/run/config/config.json:ro", "${dir:state}/config.json:/run/config/config.json:ro",
"${dir:state}/token:/run/secrets/token:ro", "${dir:state}/token:/run/secrets/token:ro",
"/var/lib/mesh/jira/broker:/run/secrets/broker:ro" "${dir:mesh-state}/broker:/run/secrets/broker:ro"
], ],
"env": { "env": {
"MESH_JIRA_TOKEN_FILE": "/run/secrets/token", "MESH_JIRA_TOKEN_FILE": "/run/secrets/token",
modules/keycloak/module.json
+6 -6
View File
@@ -63,14 +63,14 @@
}, },
"own-secrets": { "own-secrets": {
"admin": "${dir:state}/admin.secret", "admin": "${dir:state}/admin.secret",
"broker": "/var/lib/mesh/keycloak/broker" "broker": "${dir:mesh-state}/broker"
}, },
"resources": [ "resources": [
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/keycloak", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "state", "id": "state",
@@ -140,7 +140,7 @@
{ {
"id": "runtime-config", "id": "runtime-config",
"type": "file", "type": "file",
"path": "/var/lib/mesh/keycloak/config.json", "path": "${dir:mesh-state}/config.json",
"mode": "0600", "mode": "0600",
"content": "{}\n", "content": "{}\n",
"merge": "json" "merge": "json"
@@ -151,8 +151,8 @@
"name": "mesh-keycloak", "name": "mesh-keycloak",
"network": "host", "network": "host",
"volumes": [ "volumes": [
"/var/lib/mesh/keycloak/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"/var/lib/mesh/keycloak/config.json:/run/config/config.json:ro", "${dir:mesh-state}/config.json:/run/config/config.json:ro",
"${dir:state}/admin.secret:/run/secrets/admin:ro", "${dir:state}/admin.secret:/run/secrets/admin:ro",
"${dir:grants}:${dir:grants}:ro" "${dir:grants}:${dir:grants}:ro"
], ],
modules/letta/module.json
+6 -6
View File
@@ -27,7 +27,7 @@
"own-secrets": { "own-secrets": {
"server-password": "${dir:state}/server-password.secret", "server-password": "${dir:state}/server-password.secret",
"openai-api-key": "${dir:state}/openai-api-key.secret", "openai-api-key": "${dir:state}/openai-api-key.secret",
"broker": "/var/lib/mesh/letta/broker" "broker": "${dir:mesh-state}/broker"
}, },
"listens": [ "listens": [
{ {
@@ -42,8 +42,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/letta", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "state", "id": "state",
@@ -80,7 +80,7 @@
{ {
"id": "runtime-config", "id": "runtime-config",
"type": "file", "type": "file",
"path": "/var/lib/mesh/letta/config.json", "path": "${dir:mesh-state}/config.json",
"mode": "0600", "mode": "0600",
"content": "{\n \"password\": \"${secret:server-password}\"\n}\n", "content": "{\n \"password\": \"${secret:server-password}\"\n}\n",
"merge": "json" "merge": "json"
@@ -91,8 +91,8 @@
"name": "mesh-letta", "name": "mesh-letta",
"network": "letta", "network": "letta",
"volumes": [ "volumes": [
"/var/lib/mesh/letta/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"/var/lib/mesh/letta/config.json:/run/config/config.json:ro" "${dir:mesh-state}/config.json:/run/config/config.json:ro"
], ],
"env": { "env": {
"MESH_BROKER_FILE": "/run/secrets/broker", "MESH_BROKER_FILE": "/run/secrets/broker",
modules/lidarr/module.json
+5 -5
View File
@@ -10,7 +10,7 @@
], ],
"consumes": [], "consumes": [],
"own-secrets": { "own-secrets": {
"broker": "/var/lib/mesh/lidarr/broker" "broker": "${dir:mesh-state}/broker"
}, },
"listens": [ "listens": [
{ {
@@ -35,8 +35,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/lidarr", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "config", "id": "config",
@@ -70,7 +70,7 @@
"name": "mesh-lidarr", "name": "mesh-lidarr",
"network": "host", "network": "host",
"volumes": [ "volumes": [
"/var/lib/mesh/lidarr/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"/services/lidarr/config:/var/lib/lidarr/config:ro" "/services/lidarr/config:/var/lib/lidarr/config:ro"
], ],
"env": { "env": {
@@ -91,7 +91,7 @@
} }
}, },
"binds": { "binds": {
"route": "/var/lib/mesh/lidarr/route.json" "route": "${dir:mesh-state}/route.json"
}, },
"build": { "build": {
"on": [ "on": [
modules/mailu/module.json
+6 -6
View File
@@ -138,14 +138,14 @@
} }
], ],
"own-secrets": { "own-secrets": {
"broker": "/var/lib/mesh/mailu/broker" "broker": "${dir:mesh-state}/broker"
}, },
"resources": [ "resources": [
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/mailu", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "state", "id": "state",
@@ -467,7 +467,7 @@
{ {
"id": "runtime-config", "id": "runtime-config",
"type": "file", "type": "file",
"path": "/var/lib/mesh/mailu/config.json", "path": "${dir:mesh-state}/config.json",
"mode": "0600", "mode": "0600",
"content": "{}\n", "content": "{}\n",
"merge": "json" "merge": "json"
@@ -478,10 +478,10 @@
"name": "mesh-mailu", "name": "mesh-mailu",
"network": "mailu", "network": "mailu",
"volumes": [ "volumes": [
"/var/lib/mesh/mailu/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"${dir:state}/api-token.secret:/run/secrets/api-token:ro", "${dir:state}/api-token.secret:/run/secrets/api-token:ro",
"${dir:grants}:${dir:grants}:ro", "${dir:grants}:${dir:grants}:ro",
"/var/lib/mesh/mailu/config.json:/run/config/config.json:ro", "${dir:mesh-state}/config.json:/run/config/config.json:ro",
"/var/run/docker.sock:/var/run/docker.sock" "/var/run/docker.sock:/var/run/docker.sock"
], ],
"env": { "env": {
modules/marrytts/module.json
+2 -2
View File
@@ -17,8 +17,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/marrytts", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "server", "id": "server",
modules/mesh-catalog/module.json
+4 -4
View File
@@ -26,7 +26,7 @@
"postgres-database": "${dir:state}/database.secret" "postgres-database": "${dir:state}/database.secret"
}, },
"own-secrets": { "own-secrets": {
"broker": "/var/lib/mesh/mesh-catalog/broker" "broker": "${dir:mesh-state}/broker"
}, },
"consumes": [ "consumes": [
"mesh-build-machine.built", "mesh-build-machine.built",
@@ -43,8 +43,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/mesh-catalog", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "state", "id": "state",
@@ -65,7 +65,7 @@
"name": "mesh-catalog", "name": "mesh-catalog",
"network": "host", "network": "host",
"volumes": [ "volumes": [
"/var/lib/mesh/mesh-catalog/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"${dir:state}:/run/state", "${dir:state}:/run/state",
"${dir:state}/database.url:/run/secrets/database-url:ro" "${dir:state}/database.url:/run/secrets/database-url:ro"
], ],
modules/mesh-console/module.json
+4 -4
View File
@@ -9,7 +9,7 @@
"*" "*"
], ],
"own-secrets": { "own-secrets": {
"broker": "/var/lib/mesh/mesh-console/broker" "broker": "${dir:mesh-state}/broker"
}, },
"listens": [ "listens": [
{ {
@@ -24,8 +24,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/mesh-console", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "server", "id": "server",
@@ -40,7 +40,7 @@
"MESH_CONSOLE_LISTEN": "127.0.0.1:${port:4270}" "MESH_CONSOLE_LISTEN": "127.0.0.1:${port:4270}"
}, },
"volumes": [ "volumes": [
"/var/lib/mesh/mesh-console/broker:/run/secrets/broker:ro" "${dir:mesh-state}/broker:/run/secrets/broker:ro"
], ],
"artifact": "runtime" "artifact": "runtime"
} }
modules/mesh-vault/module.json
+4 -4
View File
@@ -28,14 +28,14 @@
}, },
"keeps": "/var/lib/mesh-vault/root", "keeps": "/var/lib/mesh-vault/root",
"own-secrets": { "own-secrets": {
"broker": "/var/lib/mesh/mesh-vault/broker" "broker": "${dir:mesh-state}/broker"
}, },
"resources": [ "resources": [
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/mesh-vault", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "state", "id": "state",
@@ -64,7 +64,7 @@
"name": "mesh-vault", "name": "mesh-vault",
"network": "host", "network": "host",
"volumes": [ "volumes": [
"/var/lib/mesh/mesh-vault/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"${dir:grants}:${dir:grants}:ro", "${dir:grants}:${dir:grants}:ro",
"${dir:ledger}:${dir:ledger}", "${dir:ledger}:${dir:ledger}",
"${dir:root}:${dir:root}:ro" "${dir:root}:${dir:root}:ro"
modules/minio/module.json
+4 -4
View File
@@ -60,14 +60,14 @@
}, },
"own-secrets": { "own-secrets": {
"root": "${dir:state}/root.secret", "root": "${dir:state}/root.secret",
"broker": "/var/lib/mesh/minio/broker" "broker": "${dir:mesh-state}/broker"
}, },
"resources": [ "resources": [
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/minio", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "state", "id": "state",
@@ -132,7 +132,7 @@
"name": "mesh-minio", "name": "mesh-minio",
"network": "minio-net", "network": "minio-net",
"volumes": [ "volumes": [
"/var/lib/mesh/minio/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"${dir:grants}:${dir:grants}:ro", "${dir:grants}:${dir:grants}:ro",
"${dir:state}/root.secret:/run/secrets/root:ro" "${dir:state}/root.secret:/run/secrets/root:ro"
], ],
modules/model-usage/module.json
+4 -4
View File
@@ -23,14 +23,14 @@
"*.usage.*" "*.usage.*"
], ],
"own-secrets": { "own-secrets": {
"broker": "/var/lib/mesh/model-usage/broker" "broker": "${dir:mesh-state}/broker"
}, },
"resources": [ "resources": [
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/model-usage", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "state", "id": "state",
@@ -52,7 +52,7 @@
"image": "mesh-runtime-model-usage@sha256:0000000000000000000000000000000000000000000000000000000000000000", "image": "mesh-runtime-model-usage@sha256:0000000000000000000000000000000000000000000000000000000000000000",
"network": "host", "network": "host",
"volumes": [ "volumes": [
"/var/lib/mesh/model-usage/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"${dir:state}:/run/state", "${dir:state}:/run/state",
"${dir:state}/database.url:/run/secrets/database-url:ro" "${dir:state}/database.url:/run/secrets/database-url:ro"
], ],
modules/mongodb/module.json
+4 -4
View File
@@ -40,15 +40,15 @@
}, },
"own-secrets": { "own-secrets": {
"root": "${dir:state}/root.secret", "root": "${dir:state}/root.secret",
"broker": "/var/lib/mesh/mongodb/broker" "broker": "${dir:mesh-state}/broker"
}, },
"secrets-owner": "999:999", "secrets-owner": "999:999",
"resources": [ "resources": [
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/mongodb", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "state", "id": "state",
@@ -95,7 +95,7 @@
"name": "mesh-mongodb", "name": "mesh-mongodb",
"network": "mongodb", "network": "mongodb",
"volumes": [ "volumes": [
"/var/lib/mesh/mongodb/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"${dir:grants}:${dir:grants}:ro", "${dir:grants}:${dir:grants}:ro",
"${dir:state}/root.secret:/run/secrets/root:ro" "${dir:state}/root.secret:/run/secrets/root:ro"
], ],
modules/mosquitto/module.json
+7 -7
View File
@@ -32,8 +32,8 @@
"mqtt-topic": "${dir:grants}" "mqtt-topic": "${dir:grants}"
}, },
"own-secrets": { "own-secrets": {
"admin": "/var/lib/mesh/mosquitto/admin", "admin": "${dir:mesh-state}/admin",
"broker": "/var/lib/mesh/mosquitto/broker" "broker": "${dir:mesh-state}/broker"
}, },
"listens": [ "listens": [
{ {
@@ -55,8 +55,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/mosquitto", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "state", "id": "state",
@@ -95,7 +95,7 @@
"run-once": true, "run-once": true,
"volumes": [ "volumes": [
"${dir:data}:/mosquitto/data", "${dir:data}:/mosquitto/data",
"/var/lib/mesh/mosquitto/admin:/run/secrets/admin:ro" "${dir:mesh-state}/admin:/run/secrets/admin:ro"
], ],
"env": { "env": {
"MESH_PROVISION_MQTT": "mosquitto:1883", "MESH_PROVISION_MQTT": "mosquitto:1883",
@@ -130,9 +130,9 @@
"name": "mesh-mosquitto", "name": "mesh-mosquitto",
"network": "mosquitto", "network": "mosquitto",
"volumes": [ "volumes": [
"/var/lib/mesh/mosquitto/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"${dir:grants}:${dir:grants}:ro", "${dir:grants}:${dir:grants}:ro",
"/var/lib/mesh/mosquitto/admin:/run/secrets/admin:ro" "${dir:mesh-state}/admin:/run/secrets/admin:ro"
], ],
"env": { "env": {
"MESH_BROKER_FILE": "/run/secrets/broker", "MESH_BROKER_FILE": "/run/secrets/broker",
modules/mssql/module.json
+4 -4
View File
@@ -38,14 +38,14 @@
}, },
"own-secrets": { "own-secrets": {
"sa": "${dir:state}/sa.secret", "sa": "${dir:state}/sa.secret",
"broker": "/var/lib/mesh/mssql/broker" "broker": "${dir:mesh-state}/broker"
}, },
"resources": [ "resources": [
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/mssql", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "state", "id": "state",
@@ -99,7 +99,7 @@
"name": "mesh-mssql", "name": "mesh-mssql",
"network": "mssql", "network": "mssql",
"volumes": [ "volumes": [
"/var/lib/mesh/mssql/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"${dir:grants}:/var/lib/mssql/grants:ro", "${dir:grants}:/var/lib/mssql/grants:ro",
"${dir:state}/sa.secret:/run/secrets/sa:ro" "${dir:state}/sa.secret:/run/secrets/sa:ro"
], ],
modules/nextcloud/module.json
+6 -6
View File
@@ -31,7 +31,7 @@
], ],
"own-secrets": { "own-secrets": {
"admin": "${dir:state}/admin.secret", "admin": "${dir:state}/admin.secret",
"broker": "/var/lib/mesh/nextcloud/broker" "broker": "${dir:mesh-state}/broker"
}, },
"capabilities": [ "capabilities": [
"container-runtime" "container-runtime"
@@ -49,8 +49,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/nextcloud", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "state", "id": "state",
@@ -90,7 +90,7 @@
{ {
"id": "runtime-config", "id": "runtime-config",
"type": "file", "type": "file",
"path": "/var/lib/mesh/nextcloud/config.json", "path": "${dir:mesh-state}/config.json",
"mode": "0600", "mode": "0600",
"content": "{}\n", "content": "{}\n",
"merge": "json" "merge": "json"
@@ -101,8 +101,8 @@
"name": "mesh-nextcloud", "name": "mesh-nextcloud",
"network": "host", "network": "host",
"volumes": [ "volumes": [
"/var/lib/mesh/nextcloud/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"/var/lib/mesh/nextcloud/config.json:/run/config/config.json:ro", "${dir:mesh-state}/config.json:/run/config/config.json:ro",
"${dir:state}/admin.secret:/run/secrets/admin:ro", "${dir:state}/admin.secret:/run/secrets/admin:ro",
"/var/run/docker.sock:/var/run/docker.sock" "/var/run/docker.sock:/var/run/docker.sock"
], ],
modules/nodered/module.json
+9 -9
View File
@@ -5,9 +5,9 @@
"flows.deployed" "flows.deployed"
], ],
"own-secrets": { "own-secrets": {
"admin": "/var/lib/mesh/nodered/admin", "admin": "${dir:mesh-state}/admin",
"api-token": "/var/lib/mesh/nodered/api-token", "api-token": "${dir:mesh-state}/api-token",
"broker": "/var/lib/mesh/nodered/broker" "broker": "${dir:mesh-state}/broker"
}, },
"capabilities": [ "capabilities": [
"container-runtime" "container-runtime"
@@ -25,8 +25,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/nodered", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "state", "id": "state",
@@ -90,7 +90,7 @@
{ {
"id": "runtime-config", "id": "runtime-config",
"type": "file", "type": "file",
"path": "/var/lib/mesh/nodered/config.json", "path": "${dir:mesh-state}/config.json",
"mode": "0600", "mode": "0600",
"content": "{\n \"token\": \"${secret:api-token}\"\n}\n" "content": "{\n \"token\": \"${secret:api-token}\"\n}\n"
}, },
@@ -100,8 +100,8 @@
"name": "mesh-nodered", "name": "mesh-nodered",
"network": "host", "network": "host",
"volumes": [ "volumes": [
"/var/lib/mesh/nodered/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"/var/lib/mesh/nodered/config.json:/run/config/config.json:ro" "${dir:mesh-state}/config.json:/run/config/config.json:ro"
], ],
"env": { "env": {
"MESH_BROKER_FILE": "/run/secrets/broker", "MESH_BROKER_FILE": "/run/secrets/broker",
@@ -120,7 +120,7 @@
"network": "host", "network": "host",
"run-once": true, "run-once": true,
"volumes": [ "volumes": [
"/var/lib/mesh/nodered/config.json:/run/config/config.json:ro", "${dir:mesh-state}/config.json:/run/config/config.json:ro",
"${dir:written}:/var/lib/nodered-provisions", "${dir:written}:/var/lib/nodered-provisions",
"${dir:state}/mqtt-topic.json:/run/provisions/mqtt-topic.json:ro", "${dir:state}/mqtt-topic.json:/run/provisions/mqtt-topic.json:ro",
"${dir:state}/mqtt-topic.secret:/run/provisions/mqtt-topic.secret:ro", "${dir:state}/mqtt-topic.secret:/run/provisions/mqtt-topic.secret:ro",
modules/nzbget/module.json
+8 -8
View File
@@ -10,8 +10,8 @@
], ],
"consumes": [], "consumes": [],
"own-secrets": { "own-secrets": {
"broker": "/var/lib/mesh/nzbget/broker", "broker": "${dir:mesh-state}/broker",
"password": "/var/lib/mesh/nzbget/password" "password": "${dir:mesh-state}/password"
}, },
"listens": [ "listens": [
{ {
@@ -32,8 +32,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/nzbget", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "config", "id": "config",
@@ -63,7 +63,7 @@
{ {
"id": "runtime-config", "id": "runtime-config",
"type": "file", "type": "file",
"path": "/var/lib/mesh/nzbget/config.json", "path": "${dir:mesh-state}/config.json",
"mode": "0600", "mode": "0600",
"content": "{}\n", "content": "{}\n",
"merge": "json" "merge": "json"
@@ -74,9 +74,9 @@
"name": "mesh-nzbget", "name": "mesh-nzbget",
"network": "host", "network": "host",
"volumes": [ "volumes": [
"/var/lib/mesh/nzbget/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"/var/lib/mesh/nzbget/password:/run/secrets/password:ro", "${dir:mesh-state}/password:/run/secrets/password:ro",
"/var/lib/mesh/nzbget/config.json:/run/config/config.json:ro", "${dir:mesh-state}/config.json:/run/config/config.json:ro",
"/services/nzbget/config:/var/lib/nzbget/config:ro" "/services/nzbget/config:/var/lib/nzbget/config:ro"
], ],
"env": { "env": {
modules/ombi/module.json
+9 -9
View File
@@ -9,8 +9,8 @@
"request.approved" "request.approved"
], ],
"own-secrets": { "own-secrets": {
"broker": "/var/lib/mesh/ombi/broker", "broker": "${dir:mesh-state}/broker",
"api-key": "/var/lib/mesh/ombi/api-key" "api-key": "${dir:mesh-state}/api-key"
}, },
"listens": [ "listens": [
{ {
@@ -25,8 +25,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/ombi", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "config", "id": "config",
@@ -55,7 +55,7 @@
{ {
"id": "runtime-config", "id": "runtime-config",
"type": "file", "type": "file",
"path": "/var/lib/mesh/ombi/config.json", "path": "${dir:mesh-state}/config.json",
"mode": "0600", "mode": "0600",
"content": "{}\n", "content": "{}\n",
"merge": "json" "merge": "json"
@@ -66,9 +66,9 @@
"name": "mesh-ombi", "name": "mesh-ombi",
"network": "host", "network": "host",
"volumes": [ "volumes": [
"/var/lib/mesh/ombi/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"/var/lib/mesh/ombi/api-key:/run/secrets/api-key:ro", "${dir:mesh-state}/api-key:/run/secrets/api-key:ro",
"/var/lib/mesh/ombi/config.json:/run/config/config.json:ro", "${dir:mesh-state}/config.json:/run/config/config.json:ro",
"/services/ombi/config:/var/lib/ombi/config:ro" "/services/ombi/config:/var/lib/ombi/config:ro"
], ],
"env": { "env": {
@@ -94,7 +94,7 @@
} }
}, },
"binds": { "binds": {
"route": "/var/lib/mesh/ombi/route.json" "route": "${dir:mesh-state}/route.json"
}, },
"build": { "build": {
"on": [ "on": [
modules/plex/module.json
+6 -6
View File
@@ -13,8 +13,8 @@
"*.download.completed" "*.download.completed"
], ],
"own-secrets": { "own-secrets": {
"broker": "/var/lib/mesh/plex/broker", "broker": "${dir:mesh-state}/broker",
"token": "/var/lib/mesh/plex/token" "token": "${dir:mesh-state}/token"
}, },
"listens": [ "listens": [
{ {
@@ -51,8 +51,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/plex", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "config", "id": "config",
@@ -95,8 +95,8 @@
"name": "mesh-plex", "name": "mesh-plex",
"network": "host", "network": "host",
"volumes": [ "volumes": [
"/var/lib/mesh/plex/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"/var/lib/mesh/plex/token:/run/secrets/token:ro", "${dir:mesh-state}/token:/run/secrets/token:ro",
"/services/plex/config:/var/lib/plex/config:ro" "/services/plex/config:/var/lib/plex/config:ro"
], ],
"env": { "env": {
modules/portainer/module.json
+7 -7
View File
@@ -25,8 +25,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/portainer", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "data", "id": "data",
@@ -50,7 +50,7 @@
{ {
"id": "runtime-config", "id": "runtime-config",
"type": "file", "type": "file",
"path": "/var/lib/mesh/portainer/config.json", "path": "${dir:mesh-state}/config.json",
"mode": "0600", "mode": "0600",
"content": "{}\n", "content": "{}\n",
"merge": "json" "merge": "json"
@@ -61,8 +61,8 @@
"name": "mesh-portainer", "name": "mesh-portainer",
"network": "host", "network": "host",
"volumes": [ "volumes": [
"/var/lib/mesh/portainer/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"/var/lib/mesh/portainer/config.json:/run/config/config.json:ro" "${dir:mesh-state}/config.json:/run/config/config.json:ro"
], ],
"env": { "env": {
"MESH_BROKER_FILE": "/run/secrets/broker", "MESH_BROKER_FILE": "/run/secrets/broker",
@@ -76,7 +76,7 @@
} }
], ],
"own-secrets": { "own-secrets": {
"broker": "/var/lib/mesh/portainer/broker" "broker": "${dir:mesh-state}/broker"
}, },
"build": { "build": {
"on": [ "on": [
@@ -109,6 +109,6 @@
} }
}, },
"binds": { "binds": {
"route": "/var/lib/mesh/portainer/route.json" "route": "${dir:mesh-state}/route.json"
} }
} }
modules/postgres/module.json
+4 -4
View File
@@ -49,14 +49,14 @@
}, },
"own-secrets": { "own-secrets": {
"superuser": "${dir:state}/superuser.secret", "superuser": "${dir:state}/superuser.secret",
"broker": "/var/lib/mesh/postgres/broker" "broker": "${dir:mesh-state}/broker"
}, },
"resources": [ "resources": [
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/postgres", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "state", "id": "state",
@@ -99,7 +99,7 @@
"name": "mesh-postgres", "name": "mesh-postgres",
"network": "host", "network": "host",
"volumes": [ "volumes": [
"/var/lib/mesh/postgres/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"${dir:grants}:${dir:grants}:ro", "${dir:grants}:${dir:grants}:ro",
"${dir:state}/superuser.secret:/run/secrets/superuser:ro" "${dir:state}/superuser.secret:/run/secrets/superuser:ro"
], ],
modules/qbittorrent/module.json
+8 -8
View File
@@ -11,8 +11,8 @@
], ],
"consumes": [], "consumes": [],
"own-secrets": { "own-secrets": {
"broker": "/var/lib/mesh/qbittorrent/broker", "broker": "${dir:mesh-state}/broker",
"password": "/var/lib/mesh/qbittorrent/password" "password": "${dir:mesh-state}/password"
}, },
"listens": [ "listens": [
{ {
@@ -33,8 +33,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/qbittorrent", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "config", "id": "config",
@@ -64,7 +64,7 @@
{ {
"id": "runtime-config", "id": "runtime-config",
"type": "file", "type": "file",
"path": "/var/lib/mesh/qbittorrent/config.json", "path": "${dir:mesh-state}/config.json",
"mode": "0600", "mode": "0600",
"content": "{}\n", "content": "{}\n",
"merge": "json" "merge": "json"
@@ -75,9 +75,9 @@
"name": "mesh-qbittorrent", "name": "mesh-qbittorrent",
"network": "host", "network": "host",
"volumes": [ "volumes": [
"/var/lib/mesh/qbittorrent/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"/var/lib/mesh/qbittorrent/password:/run/secrets/password:ro", "${dir:mesh-state}/password:/run/secrets/password:ro",
"/var/lib/mesh/qbittorrent/config.json:/run/config/config.json:ro", "${dir:mesh-state}/config.json:/run/config/config.json:ro",
"/services/qbittorrent/config:/var/lib/qbittorrent/config:ro" "/services/qbittorrent/config:/var/lib/qbittorrent/config:ro"
], ],
"env": { "env": {
modules/radarr/module.json
+5 -5
View File
@@ -10,7 +10,7 @@
], ],
"consumes": [], "consumes": [],
"own-secrets": { "own-secrets": {
"broker": "/var/lib/mesh/radarr/broker" "broker": "${dir:mesh-state}/broker"
}, },
"listens": [ "listens": [
{ {
@@ -35,8 +35,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/radarr", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "config", "id": "config",
@@ -70,7 +70,7 @@
"name": "mesh-radarr", "name": "mesh-radarr",
"network": "host", "network": "host",
"volumes": [ "volumes": [
"/var/lib/mesh/radarr/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"/services/radarr/config:/var/lib/radarr/config:ro" "/services/radarr/config:/var/lib/radarr/config:ro"
], ],
"env": { "env": {
@@ -91,7 +91,7 @@
} }
}, },
"binds": { "binds": {
"route": "/var/lib/mesh/radarr/route.json" "route": "${dir:mesh-state}/route.json"
}, },
"build": { "build": {
"on": [ "on": [
modules/records/module.json
+9 -9
View File
@@ -9,10 +9,10 @@
"git" "git"
], ],
"binds": { "binds": {
"git": "/var/lib/mesh/records/git.json" "git": "${dir:mesh-state}/git.json"
}, },
"own-secrets": { "own-secrets": {
"broker": "/var/lib/mesh/records/broker" "broker": "${dir:mesh-state}/broker"
}, },
"consumes": [ "consumes": [
"gitea.pull.merged" "gitea.pull.merged"
@@ -28,8 +28,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/records", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "checkout", "id": "checkout",
@@ -40,7 +40,7 @@
{ {
"id": "config", "id": "config",
"type": "file", "type": "file",
"path": "/var/lib/mesh/records/config.json", "path": "${dir:mesh-state}/config.json",
"mode": "0600", "mode": "0600",
"content": "{}\n", "content": "{}\n",
"merge": "json" "merge": "json"
@@ -48,7 +48,7 @@
{ {
"id": "origin", "id": "origin",
"type": "file", "type": "file",
"path": "/var/lib/mesh/records/origin", "path": "${dir:mesh-state}/origin",
"mode": "0600", "mode": "0600",
"content": "${bound:git:scheme}://${bound:git:at}:${bound:git:port}\n" "content": "${bound:git:scheme}://${bound:git:at}:${bound:git:port}\n"
}, },
@@ -58,9 +58,9 @@
"name": "records", "name": "records",
"network": "host", "network": "host",
"volumes": [ "volumes": [
"/var/lib/mesh/records/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"/var/lib/mesh/records/config.json:/run/config/config.json:ro", "${dir:mesh-state}/config.json:/run/config/config.json:ro",
"/var/lib/mesh/records/origin:/run/config/origin:ro", "${dir:mesh-state}/origin:/run/config/origin:ro",
"${dir:checkout}:${dir:checkout}" "${dir:checkout}:${dir:checkout}"
], ],
"env": { "env": {
modules/redis/module.json
+4 -4
View File
@@ -36,7 +36,7 @@
"secret": "${dir:state}/default.secret" "secret": "${dir:state}/default.secret"
}, },
"own-secrets": { "own-secrets": {
"broker": "/var/lib/mesh/redis/broker" "broker": "${dir:mesh-state}/broker"
}, },
"listens": [ "listens": [
{ {
@@ -51,8 +51,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/redis", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "state", "id": "state",
@@ -110,7 +110,7 @@
"name": "mesh-redis", "name": "mesh-redis",
"network": "redis", "network": "redis",
"volumes": [ "volumes": [
"/var/lib/mesh/redis/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"${dir:grants}:/var/lib/redis-module/grants:ro", "${dir:grants}:/var/lib/redis-module/grants:ro",
"${dir:state}/default.secret:/run/secrets/default:ro" "${dir:state}/default.secret:/run/secrets/default:ro"
], ],
modules/searxng/module.json
+7 -7
View File
@@ -5,8 +5,8 @@
"container-runtime" "container-runtime"
], ],
"own-secrets": { "own-secrets": {
"secret": "/var/lib/mesh/searxng/secret", "secret": "${dir:mesh-state}/secret",
"broker": "/var/lib/mesh/searxng/broker" "broker": "${dir:mesh-state}/broker"
}, },
"listens": [ "listens": [
{ {
@@ -21,8 +21,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/searxng", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "state", "id": "state",
@@ -85,7 +85,7 @@
{ {
"id": "runtime-config", "id": "runtime-config",
"type": "file", "type": "file",
"path": "/var/lib/mesh/searxng/config.json", "path": "${dir:mesh-state}/config.json",
"mode": "0600", "mode": "0600",
"content": "{}\n" "content": "{}\n"
}, },
@@ -95,8 +95,8 @@
"name": "mesh-searxng", "name": "mesh-searxng",
"network": "host", "network": "host",
"volumes": [ "volumes": [
"/var/lib/mesh/searxng/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"/var/lib/mesh/searxng/config.json:/run/config/config.json:ro" "${dir:mesh-state}/config.json:/run/config/config.json:ro"
], ],
"env": { "env": {
"MESH_BROKER_FILE": "/run/secrets/broker", "MESH_BROKER_FILE": "/run/secrets/broker",
modules/showcase/module.json
+4 -4
View File
@@ -26,7 +26,7 @@
"postgres-database": "${dir:state}/database.secret" "postgres-database": "${dir:state}/database.secret"
}, },
"own-secrets": { "own-secrets": {
"broker": "/var/lib/mesh/showcase/broker" "broker": "${dir:mesh-state}/broker"
}, },
"claims": [ "claims": [
{ {
@@ -94,8 +94,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/showcase", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "state", "id": "state",
@@ -178,7 +178,7 @@
"artifact": "helper", "artifact": "helper",
"network": "showcase", "network": "showcase",
"volumes": [ "volumes": [
"/var/lib/mesh/showcase/broker:/run/secrets/broker:ro" "${dir:mesh-state}/broker:/run/secrets/broker:ro"
], ],
"env": { "env": {
"MESH_BROKER_FILE": "/run/secrets/broker" "MESH_BROKER_FILE": "/run/secrets/broker"
modules/sonarr/module.json
+5 -5
View File
@@ -10,7 +10,7 @@
], ],
"consumes": [], "consumes": [],
"own-secrets": { "own-secrets": {
"broker": "/var/lib/mesh/sonarr/broker" "broker": "${dir:mesh-state}/broker"
}, },
"listens": [ "listens": [
{ {
@@ -39,8 +39,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/sonarr", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "config", "id": "config",
@@ -75,7 +75,7 @@
"name": "mesh-sonarr", "name": "mesh-sonarr",
"network": "host", "network": "host",
"volumes": [ "volumes": [
"/var/lib/mesh/sonarr/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"/services/sonarr/config:/var/lib/sonarr/config:ro" "/services/sonarr/config:/var/lib/sonarr/config:ro"
], ],
"env": { "env": {
@@ -96,7 +96,7 @@
} }
}, },
"binds": { "binds": {
"route": "/var/lib/mesh/sonarr/route.json" "route": "${dir:mesh-state}/route.json"
}, },
"build": { "build": {
"on": [ "on": [
modules/step-ca/module.json
+7 -7
View File
@@ -34,14 +34,14 @@
} }
], ],
"own-secrets": { "own-secrets": {
"password": "/var/lib/mesh/step-ca/password" "password": "${dir:mesh-state}/password"
}, },
"resources": [ "resources": [
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/step-ca", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "home", "id": "home",
@@ -53,7 +53,7 @@
{ {
"id": "config", "id": "config",
"type": "file", "type": "file",
"path": "/var/lib/mesh/step-ca/config.json", "path": "${dir:mesh-state}/config.json",
"mode": "0644", "mode": "0644",
"content": "{}", "content": "{}",
"merge": "json" "merge": "json"
@@ -61,7 +61,7 @@
{ {
"id": "init-env", "id": "init-env",
"type": "file", "type": "file",
"path": "/var/lib/mesh/step-ca/init.env", "path": "${dir:mesh-state}/init.env",
"mode": "0600", "mode": "0600",
"content": "DOCKER_STEPCA_INIT_PASSWORD=${secret:password}\nDOCKER_STEPCA_INIT_DNS_NAMES=${machine:at},${machine:name},localhost,127.0.0.1\n" "content": "DOCKER_STEPCA_INIT_PASSWORD=${secret:password}\nDOCKER_STEPCA_INIT_DNS_NAMES=${machine:at},${machine:name},localhost,127.0.0.1\n"
}, },
@@ -72,7 +72,7 @@
"image": "smallstep/step-ca@sha256:a2b17872915c193259b75a5474c398326f41bd199f0842093e52cf4182bc8270", "image": "smallstep/step-ca@sha256:a2b17872915c193259b75a5474c398326f41bd199f0842093e52cf4182bc8270",
"network": "host", "network": "host",
"env-file": [ "env-file": [
"/var/lib/mesh/step-ca/init.env" "${dir:mesh-state}/init.env"
], ],
"env": { "env": {
"DOCKER_STEPCA_INIT_NAME": "Mesh Internal CA", "DOCKER_STEPCA_INIT_NAME": "Mesh Internal CA",
@@ -81,7 +81,7 @@
}, },
"volumes": [ "volumes": [
"${dir:home}:/home/step", "${dir:home}:/home/step",
"/var/lib/mesh/step-ca:/run/mesh:ro" "${dir:mesh-state}:/run/mesh:ro"
], ],
"secrets-in-environment": "the entrypoint honours DOCKER_STEPCA_INIT_PASSWORD_FILE; convertible, awaiting a bed that proves it" "secrets-in-environment": "the entrypoint honours DOCKER_STEPCA_INIT_PASSWORD_FILE; convertible, awaiting a bed that proves it"
} }
modules/tautulli/module.json
+7 -7
View File
@@ -5,7 +5,7 @@
"watch.recorded" "watch.recorded"
], ],
"own-secrets": { "own-secrets": {
"broker": "/var/lib/mesh/tautulli/broker" "broker": "${dir:mesh-state}/broker"
}, },
"capabilities": [ "capabilities": [
"container-runtime" "container-runtime"
@@ -23,8 +23,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/tautulli", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "config", "id": "config",
@@ -53,7 +53,7 @@
{ {
"id": "runtime-config", "id": "runtime-config",
"type": "file", "type": "file",
"path": "/var/lib/mesh/tautulli/config.json", "path": "${dir:mesh-state}/config.json",
"mode": "0600", "mode": "0600",
"content": "{}\n", "content": "{}\n",
"merge": "json" "merge": "json"
@@ -64,8 +64,8 @@
"name": "mesh-tautulli", "name": "mesh-tautulli",
"network": "host", "network": "host",
"volumes": [ "volumes": [
"/var/lib/mesh/tautulli/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"/var/lib/mesh/tautulli/config.json:/run/config/config.json:ro", "${dir:mesh-state}/config.json:/run/config/config.json:ro",
"/services/tautulli/config:/var/lib/tautulli/config:ro" "/services/tautulli/config:/var/lib/tautulli/config:ro"
], ],
"env": { "env": {
@@ -90,7 +90,7 @@
} }
}, },
"binds": { "binds": {
"route": "/var/lib/mesh/tautulli/route.json" "route": "${dir:mesh-state}/route.json"
}, },
"build": { "build": {
"on": [ "on": [
modules/umami/module.json
+4 -4
View File
@@ -45,7 +45,7 @@
"analytics": "${dir:grants}" "analytics": "${dir:grants}"
}, },
"own-secrets": { "own-secrets": {
"broker": "/var/lib/mesh/umami/broker" "broker": "${dir:mesh-state}/broker"
}, },
"listens": [ "listens": [
{ {
@@ -60,8 +60,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/umami", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "state", "id": "state",
@@ -113,7 +113,7 @@
"name": "mesh-umami", "name": "mesh-umami",
"network": "umami", "network": "umami",
"volumes": [ "volumes": [
"/var/lib/mesh/umami/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"${dir:grants}:${dir:grants}", "${dir:grants}:${dir:grants}",
"${dir:state}/admin.secret:/run/secrets/admin:ro" "${dir:state}/admin.secret:/run/secrets/admin:ro"
], ],
modules/unifi/module.json
+7 -7
View File
@@ -73,8 +73,8 @@
{ {
"id": "mesh-state", "id": "mesh-state",
"type": "directory", "type": "directory",
"path": "/var/lib/mesh/unifi", "mode": "0700",
"mode": "0700" "place": "mesh"
}, },
{ {
"id": "state", "id": "state",
@@ -118,7 +118,7 @@
{ {
"id": "runtime-config", "id": "runtime-config",
"type": "file", "type": "file",
"path": "/var/lib/mesh/unifi/config.json", "path": "${dir:mesh-state}/config.json",
"mode": "0600", "mode": "0600",
"content": "{\n \"site\": \"default\",\n \"password\": \"${secret:controller}\"\n}\n", "content": "{\n \"site\": \"default\",\n \"password\": \"${secret:controller}\"\n}\n",
"merge": "json" "merge": "json"
@@ -129,8 +129,8 @@
"name": "mesh-unifi", "name": "mesh-unifi",
"network": "host", "network": "host",
"volumes": [ "volumes": [
"/var/lib/mesh/unifi/broker:/run/secrets/broker:ro", "${dir:mesh-state}/broker:/run/secrets/broker:ro",
"/var/lib/mesh/unifi/config.json:/run/config/config.json:ro" "${dir:mesh-state}/config.json:/run/config/config.json:ro"
], ],
"env": { "env": {
"MESH_BROKER_FILE": "/run/secrets/broker", "MESH_BROKER_FILE": "/run/secrets/broker",
@@ -158,8 +158,8 @@
"route": "${dir:state}/route.json" "route": "${dir:state}/route.json"
}, },
"own-secrets": { "own-secrets": {
"broker": "/var/lib/mesh/unifi/broker", "broker": "${dir:mesh-state}/broker",
"controller": "/var/lib/mesh/unifi/controller" "controller": "${dir:mesh-state}/controller"
}, },
"build": { "build": {
"on": [ "on": [