nextcloud: it lives under its own name, and html is placed

The module is nextcloud; its tree was /var/lib/nextcloud-module — a
historic spelling nothing depends on. The root moves to
/var/lib/nextcloud (a rename on the node, done in this change's
window), and html drops its path: the mesh resolves it to
<root>/nextcloud/html. Landing this requires the window: rename the
tree, push, recreate the container — a changed volume path does not
recreate one by itself (hq 126).
This commit is contained in:
2026-09-26 18:05:28 +02:00
parent f98c9859d2
commit 6761bb02a1
+11 -12
View File
@@ -17,20 +17,20 @@
} }
}, },
"binds": { "binds": {
"postgres-database": "/var/lib/nextcloud-module/database.json", "postgres-database": "/var/lib/nextcloud/database.json",
"s3-bucket": "/var/lib/nextcloud-module/store.json", "s3-bucket": "/var/lib/nextcloud/store.json",
"route": "/var/lib/nextcloud-module/route.json" "route": "/var/lib/nextcloud/route.json"
}, },
"secrets": { "secrets": {
"postgres-database": "/var/lib/nextcloud-module/database.secret", "postgres-database": "/var/lib/nextcloud/database.secret",
"s3-bucket": "/var/lib/nextcloud-module/store.secret" "s3-bucket": "/var/lib/nextcloud/store.secret"
}, },
"emits": [ "emits": [
"module.nextcloud.user.created", "module.nextcloud.user.created",
"module.nextcloud.share.created" "module.nextcloud.share.created"
], ],
"own-secrets": { "own-secrets": {
"admin": "/var/lib/nextcloud-module/admin.secret", "admin": "/var/lib/nextcloud/admin.secret",
"broker": "/var/lib/mesh/nextcloud/broker" "broker": "/var/lib/mesh/nextcloud/broker"
}, },
"capabilities": [ "capabilities": [
@@ -54,20 +54,19 @@
{ {
"id": "state", "id": "state",
"type": "directory", "type": "directory",
"path": "/var/lib/nextcloud-module", "path": "/var/lib/nextcloud",
"mode": "0700" "mode": "0700"
}, },
{ {
"id": "server-env", "id": "server-env",
"type": "file", "type": "file",
"path": "/var/lib/nextcloud-module/server.env", "path": "/var/lib/nextcloud/server.env",
"mode": "0600", "mode": "0600",
"content": "POSTGRES_HOST=${bound:postgres-database:at}:${bound:postgres-database:port}\nPOSTGRES_DB=${bound:postgres-database:as}\nPOSTGRES_USER=${bound:postgres-database:as}\nPOSTGRES_PASSWORD=${secret:postgres-database}\nNEXTCLOUD_ADMIN_USER=mesh-admin\nNEXTCLOUD_ADMIN_PASSWORD=${secret:admin}\nOBJECTSTORE_S3_HOST=${bound:s3-bucket:at}\nOBJECTSTORE_S3_PORT=${bound:s3-bucket:port}\nOBJECTSTORE_S3_BUCKET=mesh-novox-ncloud\nOBJECTSTORE_S3_KEY=${bound:s3-bucket:as}\nOBJECTSTORE_S3_SECRET=${secret:s3-bucket}\nOBJECTSTORE_S3_SSL=false\nOBJECTSTORE_S3_USEPATH_STYLE=true\nOBJECTSTORE_S3_REGION=${bound:s3-bucket:region}\n" "content": "POSTGRES_HOST=${bound:postgres-database:at}:${bound:postgres-database:port}\nPOSTGRES_DB=${bound:postgres-database:as}\nPOSTGRES_USER=${bound:postgres-database:as}\nPOSTGRES_PASSWORD=${secret:postgres-database}\nNEXTCLOUD_ADMIN_USER=mesh-admin\nNEXTCLOUD_ADMIN_PASSWORD=${secret:admin}\nOBJECTSTORE_S3_HOST=${bound:s3-bucket:at}\nOBJECTSTORE_S3_PORT=${bound:s3-bucket:port}\nOBJECTSTORE_S3_BUCKET=mesh-novox-ncloud\nOBJECTSTORE_S3_KEY=${bound:s3-bucket:as}\nOBJECTSTORE_S3_SECRET=${secret:s3-bucket}\nOBJECTSTORE_S3_SSL=false\nOBJECTSTORE_S3_USEPATH_STYLE=true\nOBJECTSTORE_S3_REGION=${bound:s3-bucket:region}\n"
}, },
{ {
"id": "html", "id": "html",
"type": "directory", "type": "directory",
"path": "/var/lib/nextcloud-module/html",
"mode": "0750", "mode": "0750",
"owner": "33:33" "owner": "33:33"
}, },
@@ -77,13 +76,13 @@
"name": "nextcloud", "name": "nextcloud",
"image": "nextcloud@sha256:fb966733647ea03f0446b0c22eac9733c8eb616d37b960caca9d4c3010e14a08", "image": "nextcloud@sha256:fb966733647ea03f0446b0c22eac9733c8eb616d37b960caca9d4c3010e14a08",
"env-file": [ "env-file": [
"/var/lib/nextcloud-module/server.env" "/var/lib/nextcloud/server.env"
], ],
"ports": [ "ports": [
"80" "80"
], ],
"volumes": [ "volumes": [
"/var/lib/nextcloud-module/html:/var/www/html" "${dir:html}:/var/www/html"
], ],
"secrets-in-environment": "the image honours POSTGRES_PASSWORD_FILE and NEXTCLOUD_ADMIN_PASSWORD_FILE (entrypoint file_env); OBJECTSTORE_S3_SECRET has none and needs a generated config fragment; convertible, awaiting a bed" "secrets-in-environment": "the image honours POSTGRES_PASSWORD_FILE and NEXTCLOUD_ADMIN_PASSWORD_FILE (entrypoint file_env); OBJECTSTORE_S3_SECRET has none and needs a generated config fragment; convertible, awaiting a bed"
}, },
@@ -103,7 +102,7 @@
"volumes": [ "volumes": [
"/var/lib/mesh/nextcloud/broker:/run/secrets/broker:ro", "/var/lib/mesh/nextcloud/broker:/run/secrets/broker:ro",
"/var/lib/mesh/nextcloud/config.json:/run/config/config.json:ro", "/var/lib/mesh/nextcloud/config.json:/run/config/config.json:ro",
"/var/lib/nextcloud-module/admin.secret:/run/secrets/admin:ro", "/var/lib/nextcloud/admin.secret:/run/secrets/admin:ro",
"/var/run/docker.sock:/var/run/docker.sock" "/var/run/docker.sock:/var/run/docker.sock"
], ],
"env": { "env": {