From 2c2b3f789c560da8e50e2e1bb086c3b88eb185b4 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@thegeeklab.de>
Date: Sat, 5 Aug 2023 23:49:35 +0200
Subject: [PATCH] use dedicated systemd env file

---
 defaults/main.yml                               |  2 +-
 tasks/main.yml                                  |  9 ++++++---
 .../etc/containers/systemd/redis.container.j2   |  3 ++-
 templates/etc/containers/systemd/redis.env.j2   | 15 ---------------
 .../etc/containers/systemd/redis.env.sys.j2     | 17 +++++++++++++++++
 5 files changed, 26 insertions(+), 20 deletions(-)
 create mode 100644 templates/etc/containers/systemd/redis.env.sys.j2

diff --git a/defaults/main.yml b/defaults/main.yml
index 39cdd85..443190d 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -44,7 +44,7 @@ redis_podman_args:
   - --health-retries=6
   - --health-on-failure=kill
 
-redis_loglevel: "notice"
+redis_log_level: "notice"
 
 redis_timeout: 300
 redis_databases: 16
diff --git a/tasks/main.yml b/tasks/main.yml
index dfd5042..fe925b2 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -25,13 +25,16 @@
       set_fact:
         __redis_volumes_map: "{{ __redis_volumes_raw.results | json_query('[].volume') | items2dict(key_name='Name', value_name='Mountpoint') }}"
 
-    - name: Deploy redis env file
+    - name: Deploy redis env files
       template:
-        src: etc/containers/systemd/redis.env.j2
-        dest: "/etc/containers/systemd/redis.env"
+        src: "etc/containers/systemd/{{ item }}.j2"
+        dest: "/etc/containers/systemd/{{ item }}"
         owner: root
         group: root
         mode: "0640"
+      loop:
+        - redis.env
+        - redis.sys.env
       notify: __redis_restart
 
     - name: Create container specs
diff --git a/templates/etc/containers/systemd/redis.container.j2 b/templates/etc/containers/systemd/redis.container.j2
index f2fa5f4..a0653da 100644
--- a/templates/etc/containers/systemd/redis.container.j2
+++ b/templates/etc/containers/systemd/redis.container.j2
@@ -7,12 +7,13 @@ WantedBy=default.target
 Restart=on-failure
 RestartSec=5s
 
-EnvironmentFile=/etc/containers/systemd/redis.env
+EnvironmentFile=/etc/containers/systemd/redis.sys.env
 ExecReload=/usr/bin/podman kill --signal=SIGHUP %p
 
 [Container]
 Image={{ redis_image }}
 Exec=redis-server $REDIS_ARGS
+EnvironmentFile=/etc/containers/systemd/redis.env
 User=999
 Group=999
 {% for item in redis_volumes %}
diff --git a/templates/etc/containers/systemd/redis.env.j2 b/templates/etc/containers/systemd/redis.env.j2
index 53a7e61..ff34a98 100644
--- a/templates/etc/containers/systemd/redis.env.j2
+++ b/templates/etc/containers/systemd/redis.env.j2
@@ -1,17 +1,2 @@
 #jinja2: lstrip_blocks: True
 {{ ansible_managed | comment }}
-REDIS_ARGS=--timeout {{ redis_timeout }} --loglevel {{ redis_loglevel }} --databases {{ redis_databases }} \
-    {% for save in redis_save %}
-    --save '{{ save }}'\
-    {% endfor %}
-    --rdbcompression {{ redis_rdbcompression | bool | ternary("yes", "no") }} \
-    --appendonly {{ redis_appendonly | bool | ternary("yes", "no") }} \
-    --appendfsync {{ redis_appendfsync }} \
-    --no-appendfsync-on-rewrite no \
-    {% if redis_requirepass is defined %}
-    --requirepass {{ redis_requirepass }} \
-    {% endif %}
-    {% for command in redis_disabled_commands %}
-    --rename-command '{{ command }} ""' \
-    {% endfor %}
-    --port 6379
diff --git a/templates/etc/containers/systemd/redis.env.sys.j2 b/templates/etc/containers/systemd/redis.env.sys.j2
new file mode 100644
index 0000000..67df317
--- /dev/null
+++ b/templates/etc/containers/systemd/redis.env.sys.j2
@@ -0,0 +1,17 @@
+#jinja2: lstrip_blocks: True
+{{ ansible_managed | comment }}
+REDIS_ARGS=--timeout {{ redis_timeout }} --loglevel {{ redis_log_level }} --databases {{ redis_databases }} \
+    {% for save in redis_save %}
+    --save '{{ save }}'\
+    {% endfor %}
+    --rdbcompression {{ redis_rdbcompression | bool | ternary("yes", "no") }} \
+    --appendonly {{ redis_appendonly | bool | ternary("yes", "no") }} \
+    --appendfsync {{ redis_appendfsync }} \
+    --no-appendfsync-on-rewrite no \
+    {% if redis_requirepass is defined %}
+    --requirepass {{ redis_requirepass }} \
+    {% endif %}
+    {% for command in redis_disabled_commands %}
+    --rename-command '{{ command }} ""' \
+    {% endfor %}
+    --port 6379