From 077c65d8b961ff2e54a8c73d241900e50d8c6664 Mon Sep 17 00:00:00 2001
From: mwiegand <mwiegand@seibert-media.net>
Date: Fri, 22 Oct 2021 17:15:31 +0200
Subject: [PATCH] redis conf multiple values

---
 bundles/redis/items.py    |  5 +++--
 bundles/redis/metadata.py | 22 +++++++++-------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/bundles/redis/items.py b/bundles/redis/items.py
index 25cf083..c077b46 100644
--- a/bundles/redis/items.py
+++ b/bundles/redis/items.py
@@ -36,9 +36,10 @@ for name, conf in node.metadata.get('redis').items():
     files[f'/etc/redis/{name}.conf'] = {
         'content': '\n'.join(
             f'{key} {value}'
-                for key, value in sorted(conf.items())
+                for key, values in sorted(conf.items())
+                for value in ([values] if isinstance(values, str) else sorted(values))
                 if value is not False
-        ),
+        ) + '\n',
         'owner': 'redis',
         'triggers': [
             f'svc_systemd:redis-{name}:restart'
diff --git a/bundles/redis/metadata.py b/bundles/redis/metadata.py
index 648906a..b125ccf 100644
--- a/bundles/redis/metadata.py
+++ b/bundles/redis/metadata.py
@@ -53,24 +53,19 @@ def config(metadata):
             'logfile': f'/var/log/redis/{name}.log',
             'databases': '16',
             'always-show-logo': 'yes',
-            'save': '900 1',
-            'save': '300 10',
-            'save': '60 10000',
+            'save': {
+                '900 1',
+                '300 10',
+                '60 10000',
+            },
             'stop-writes-on-bgsave-error': 'yes',
             'rdbcompression': 'yes',
             'rdbchecksum': 'yes',
             'dbfilename': f'{name}.rdb',
             'dir': '/var/lib/redis',
-            'replica-serve-stale-data': 'yes',
-            'replica-read-only': 'yes',
-            'repl-diskless-sync': 'no',
-            'repl-diskless-sync-delay': '5',
-            'repl-disable-tcp-nodelay': 'no',
-            'replica-priority': '100',
             'lazyfree-lazy-eviction': 'no',
             'lazyfree-lazy-expire': 'no',
             'lazyfree-lazy-server-del': 'no',
-            'replica-lazy-flush': 'no',
             'appendonly': 'no',
             'appendfilename': '"appendonly.aof"',
             'appendfsync': 'everysec',
@@ -95,9 +90,10 @@ def config(metadata):
             'stream-node-max-bytes': '4096',
             'stream-node-max-entries': '100',
             'activerehashing': 'yes',
-            'client-output-buffer-limit': 'normal 0 0 0',
-            'client-output-buffer-limit': 'replica 256mb 64mb 60',
-            'client-output-buffer-limit': 'pubsub 32mb 8mb 60',
+            'client-output-buffer-limit': {
+                'normal 0 0 0',
+                'pubsub 32mb 8mb 60',
+            },
             'hz': '10',
             'dynamic-hz': 'yes',
             'aof-rewrite-incremental-fsync': 'yes',