cronekorkn/bundlewrap
1
0
Fork 0
Code Issues Pull requests 8 Projects Releases Wiki Activity

change redis run dirs

Browse source
This commit is contained in:
mwiegand 2021-11-13 14:57:43 +01:00
parent 2ec0e5068a
commit 2d4afe6b53
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bundles/nextcloud/files/managed.config.php
View file

@ -26,6 +26,6 @@ $CONFIG = array (
"memcache.locking" => "\\OC\\Memcache\\Redis", "memcache.locking" => "\\OC\\Memcache\\Redis",
"memcache.distributed" => "\OC\Memcache\Redis", "memcache.distributed" => "\OC\Memcache\Redis",
"redis" => [ "redis" => [
"host" => "/var/run/redis-nextcloud/redis.sock", "host" => "/var/run/redis/nextcloud.sock",
], ],
); );

10
bundles/redis/metadata.py
View file

@ -42,13 +42,13 @@ def config(metadata):
'protected-mode': 'yes', 'protected-mode': 'yes',
'port': '0', 'port': '0',
'tcp-backlog': '511', 'tcp-backlog': '511',
'unixsocket': f'/var/run/redis-{name}/redis.sock', 'unixsocket': f'/var/run/redis/{name}.sock',
'unixsocketperm': '777', 'unixsocketperm': '777',
'timeout': '0', 'timeout': '0',
'tcp-keepalive': '300', 'tcp-keepalive': '300',
'daemonize': 'yes', 'daemonize': 'yes',
'supervised': 'no', 'supervised': 'no',
'pidfile': f'/var/run/redis-{name}/redis.pid', 'pidfile': f'/var/run/redis/{name}.pid',
'loglevel': 'notice', 'loglevel': 'notice',
'logfile': f'/var/log/redis/{name}.log', 'logfile': f'/var/log/redis/{name}.log',
'databases': '16', 'databases': '16',
@ -121,12 +121,12 @@ def units(metadata):
'Service': { 'Service': {
'Type': 'notify', 'Type': 'notify',
'ExecStart': f'/usr/bin/redis-server /etc/redis/{name}.conf --supervised systemd --daemonize no', 'ExecStart': f'/usr/bin/redis-server /etc/redis/{name}.conf --supervised systemd --daemonize no',
'PIDFile': f'/run/redis-{name}/redis.pid', 'PIDFile': f'/run/redis/{name}.pid',
'TimeoutStopSec': '0', 'TimeoutStopSec': '0',
'Restart': 'always', 'Restart': 'always',
'User': 'redis', 'User': 'redis',
'Group': 'redis', 'Group': 'redis',
'RuntimeDirectory': f'redis-{name}', 'RuntimeDirectory': f'redis',
'RuntimeDirectoryMode': '2755', 'RuntimeDirectoryMode': '2755',
'UMask': '007', 'UMask': '007',
@ -138,7 +138,7 @@ def units(metadata):
'ReadWritePaths': [ 'ReadWritePaths': [
'-/var/lib/redis', '-/var/lib/redis',
'-/var/log/redis', '-/var/log/redis',
f'-/var/run/redis-{name}', f'-/var/run/redis',
], ],
'NoNewPrivileges': 'true', 'NoNewPrivileges': 'true',

2
bundles/rspamd/files/local.d/redis.conf
View file

@ -1 +1 @@
servers = "/var/run/redis-rspamd/redis.sock"; servers = "/var/run/redis/rspamd.sock";