diff --git a/modules/redis/module.json b/modules/redis/module.json index f976dd6..324ca9a 100644 --- a/modules/redis/module.json +++ b/modules/redis/module.json @@ -27,13 +27,13 @@ } }, "receives": { - "redis-cache": "/var/lib/redis-module/grants/mesh.json" + "redis-cache": "${dir:grants}/mesh.json" }, "grants": { - "redis-cache": "/var/lib/redis-module/grants" + "redis-cache": "${dir:grants}" }, "secrets": { - "secret": "/var/lib/redis-module/default.secret" + "secret": "${dir:state}/default.secret" }, "own-secrets": { "broker": "/var/lib/mesh/redis/broker" @@ -57,29 +57,27 @@ { "id": "state", "type": "directory", - "path": "/var/lib/redis-module", - "mode": "0700" + "mode": "0700", + "place": "." }, { - "id": "grants-dir", + "id": "grants", "type": "directory", - "path": "/var/lib/redis-module/grants", "mode": "0700" }, { "id": "data", "type": "directory", - "path": "/services/redis/data", "mode": "0700", - "owner": "999:999" + "owner": "999:1000" }, { "id": "server-conf", "type": "file", - "path": "/var/lib/redis-module/redis.conf", + "path": "${dir:state}/redis.conf", "mode": "0600", "content": "requirepass ${secret:secret}\nappendonly yes\ndir /data\n", - "owner": "999:999" + "owner": "999:1000" }, { "id": "net", @@ -90,14 +88,14 @@ "id": "server", "type": "container", "name": "redis", - "image": "redis@sha256:ff02b58f971e7d7d156a1267e283fcbbeee91773b6aa36c49dac28ecfe28eadf", + "image": "redis@sha256:520775a41a63e77e06c73e35d2fd9cc15921a609516818796b4ecbb813078bc7", "network": "redis", "ports": [ "6379" ], "volumes": [ - "/services/redis/data:/data", - "/var/lib/redis-module/redis.conf:/etc/redis/redis.conf:ro" + "${dir:data}:/data", + "${dir:state}/redis.conf:/etc/redis/redis.conf:ro" ], "args": [ "/etc/redis/redis.conf" @@ -113,8 +111,8 @@ "network": "redis", "volumes": [ "/var/lib/mesh/redis/broker:/run/secrets/broker:ro", - "/var/lib/redis-module/grants:/var/lib/redis-module/grants:ro", - "/var/lib/redis-module/default.secret:/run/secrets/default:ro" + "${dir:grants}:/var/lib/redis-module/grants:ro", + "${dir:state}/default.secret:/run/secrets/default:ro" ], "env": { "MESH_BROKER_FILE": "/run/secrets/broker",