From a6a2be4373a473704fbaf47d53a8887e140f46b8 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Fri, 12 Sep 2025 13:04:06 +0200
Subject: [PATCH] Optimized Listmonk variables

---
 roles/web-app-listmonk/tasks/main.yml |  3 ++-
 roles/web-app-listmonk/vars/main.yml  | 18 ++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/roles/web-app-listmonk/tasks/main.yml b/roles/web-app-listmonk/tasks/main.yml
index 7e33f82f..5bbb7baa 100644
--- a/roles/web-app-listmonk/tasks/main.yml
+++ b/roles/web-app-listmonk/tasks/main.yml
@@ -3,8 +3,9 @@
   include_role: 
     name: sys-stk-full-stateful
   vars:
+    docker_compose_flush_handlers: false
     proxy_extra_configuration: >-
-      {% if not applications | get_app_conf(application_id, 'public_api_activated', True) %}
+      {% if not LISTMONK_PUBLIC_API_ENABLED | bool %}
       {{ lookup('file', '{{ playbook_dir }}/roles/web-app-listmonk/files/deactivate-public-api.conf') }}
       {% else %}
       ""
diff --git a/roles/web-app-listmonk/vars/main.yml b/roles/web-app-listmonk/vars/main.yml
index d972bff6..1fa04133 100644
--- a/roles/web-app-listmonk/vars/main.yml
+++ b/roles/web-app-listmonk/vars/main.yml
@@ -1,16 +1,14 @@
 # General 
-application_id: "web-app-listmonk"
-database_type:  "postgres"
-
-container_port:   "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.port') }}"
-
-# Docker
-docker_compose_flush_handlers: false
+application_id:               "web-app-listmonk"
+database_type:                "postgres"
+container_port:               "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.port') }}"
 
 # Listmonk
-LISTMONK_VERSION: "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.version') }}"
-LISTMONK_IMAGE:   "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.image') }}"
-LISTMONK_NAME:    "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.name') }}"
+LISTMONK_VERSION:             "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.version') }}"
+LISTMONK_IMAGE:               "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.image') }}"
+LISTMONK_NAME:                "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.name') }}"
+
+LISTMONK_PUBLIC_API_ENABLED:  "{{ applications | get_app_conf(application_id, 'public_api_activated') }}"
 
 LISTMONK_SETTINGS:
   - key: "app.root_url"