diff --git a/bundles/redis/metadata.py b/bundles/redis/metadata.py index 1dfd246..15ab1c2 100644 --- a/bundles/redis/metadata.py +++ b/bundles/redis/metadata.py @@ -40,15 +40,15 @@ def config(metadata): 'protected-mode': 'yes', 'port': '6379', 'tcp-backlog': '511', - 'unixsocket': f'/var/run/redis/redis-{name}.sock', + 'unixsocket': f'/var/run/redis-{name}/redis.sock', 'unixsocketperm': '700', 'timeout': '0', 'tcp-keepalive': '300', 'daemonize': 'yes', 'supervised': 'no', - 'pidfile': f'/var/run/redis/redis-{name}.pid', + 'pidfile': f'/var/run/redis-{name}/redis.pid', 'loglevel': 'notice', - 'logfile': f'/var/log/redis/redis-{name}.log', + 'logfile': f'/var/log/redis/{name}.log', 'databases': '16', 'always-show-logo': 'yes', 'save': '900 1', @@ -122,12 +122,12 @@ def units(metadata): 'Service': { 'Type': 'notify', 'ExecStart': f'/usr/bin/redis-server /etc/redis/{name}.conf --supervised systemd --daemonize no', - 'PIDFile': f'/run/redis/redis-{name}.pid', + 'PIDFile': f'/run/redis-{name}/redis.pid', 'TimeoutStopSec': '0', 'Restart': 'always', 'User': 'redis', 'Group': 'redis', - 'RuntimeDirectory': f'redis', + 'RuntimeDirectory': f'redis-{name}', 'RuntimeDirectoryMode': '2755', 'UMask': '007', @@ -139,7 +139,7 @@ def units(metadata): 'ReadWritePaths': [ '-/var/lib/redis', '-/var/log/redis', - '-/var/run/redis', + f'-/var/run/redis-{name}', ], 'NoNewPrivileges': 'true',