From 2d4afe6b536008df60550d7161748a59cf4fa389 Mon Sep 17 00:00:00 2001
From: mwiegand <mwiegand@seibert-media.net>
Date: Sat, 13 Nov 2021 14:57:43 +0100
Subject: [PATCH] change redis run dirs

---
 bundles/nextcloud/files/managed.config.php |  2 +-
 bundles/redis/metadata.py                  | 10 +++++-----
 bundles/rspamd/files/local.d/redis.conf    |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bundles/nextcloud/files/managed.config.php b/bundles/nextcloud/files/managed.config.php
index 867d740..d047b0c 100644
--- a/bundles/nextcloud/files/managed.config.php
+++ b/bundles/nextcloud/files/managed.config.php
@@ -26,6 +26,6 @@ $CONFIG = array (
   "memcache.locking" => "\\OC\\Memcache\\Redis",
   "memcache.distributed" => "\OC\Memcache\Redis",
   "redis" => [
-    "host" => "/var/run/redis-nextcloud/redis.sock",
+    "host" => "/var/run/redis/nextcloud.sock",
   ],
 );
diff --git a/bundles/redis/metadata.py b/bundles/redis/metadata.py
index b125ccf..b016273 100644
--- a/bundles/redis/metadata.py
+++ b/bundles/redis/metadata.py
@@ -42,13 +42,13 @@ def config(metadata):
             'protected-mode': 'yes',
             'port': '0',
             'tcp-backlog': '511',
-            'unixsocket': f'/var/run/redis-{name}/redis.sock',
+            'unixsocket': f'/var/run/redis/{name}.sock',
             'unixsocketperm': '777',
             'timeout': '0',
             'tcp-keepalive': '300',
             'daemonize': 'yes',
             'supervised': 'no',
-            'pidfile': f'/var/run/redis-{name}/redis.pid',
+            'pidfile': f'/var/run/redis/{name}.pid',
             'loglevel': 'notice',
             'logfile': f'/var/log/redis/{name}.log',
             'databases': '16',
@@ -121,12 +121,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-{name}/redis.pid',
+                'PIDFile': f'/run/redis/{name}.pid',
                 'TimeoutStopSec': '0',
                 'Restart': 'always',
                 'User': 'redis',
                 'Group': 'redis',
-                'RuntimeDirectory': f'redis-{name}',
+                'RuntimeDirectory': f'redis',
                 'RuntimeDirectoryMode': '2755',
                 
                 'UMask': '007',
@@ -138,7 +138,7 @@ def units(metadata):
                 'ReadWritePaths': [
                     '-/var/lib/redis',
                     '-/var/log/redis',
-                    f'-/var/run/redis-{name}',
+                    f'-/var/run/redis',
                 ],
                 
                 'NoNewPrivileges': 'true',
diff --git a/bundles/rspamd/files/local.d/redis.conf b/bundles/rspamd/files/local.d/redis.conf
index d35aabf..06955e2 100644
--- a/bundles/rspamd/files/local.d/redis.conf
+++ b/bundles/rspamd/files/local.d/redis.conf
@@ -1 +1 @@
-servers = "/var/run/redis-rspamd/redis.sock";
+servers = "/var/run/redis/rspamd.sock";