From fb04a4c7a0574258ea310e05b6f1fe0ee0927902 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Fri, 26 Sep 2025 18:43:09 +0200
Subject: [PATCH] Restructured Front Proxy variables

---
 roles/sys-stk-front-proxy/defaults/main.yml | 5 +----
 roles/sys-stk-front-proxy/tasks/01_base.yml | 8 ++++----
 roles/sys-stk-front-proxy/vars/main.yml     | 3 ++-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/roles/sys-stk-front-proxy/defaults/main.yml b/roles/sys-stk-front-proxy/defaults/main.yml
index 131ec89e..beef469b 100644
--- a/roles/sys-stk-front-proxy/defaults/main.yml
+++ b/roles/sys-stk-front-proxy/defaults/main.yml
@@ -1,8 +1,5 @@
 # default vhost flavour
-vhost_flavour:        "basic"               # valid: basic, ws_generic
-
-# build the full template path from the flavour
-vhost_template_src:   "roles/sys-svc-proxy/templates/vhost/{{ vhost_flavour }}.conf.j2"
+vhost_flavour:              "basic" # valid: basic, ws_generic
 
 # Enable / Disable Proxy during development, for faster Debugging
 SYS_STK_FRONT_PROXY_ENABLED: true
\ No newline at end of file
diff --git a/roles/sys-stk-front-proxy/tasks/01_base.yml b/roles/sys-stk-front-proxy/tasks/01_base.yml
index dec5b999..197aaa3d 100644
--- a/roles/sys-stk-front-proxy/tasks/01_base.yml
+++ b/roles/sys-stk-front-proxy/tasks/01_base.yml
@@ -13,14 +13,14 @@
   vars:
     handler_role_name: "svc-prx-openresty"
 
-- name: "include role for {{ domain }} to receive certificates and do the modification routines"
+- name: "include role for '{{ domain }}' to receive certificates and do the modification routines"
   include_role:
     name: sys-util-csp-cert
 
-- name: "Copy nginx config to {{ configuration_destination }}"
+- name: "Copy nginx config to '{{ FRONT_PROXY_DOMAIN_CONF_DST }}'"
   template:
-    src: "{{ vhost_template_src }}"
-    dest: "{{ configuration_destination }}"
+    src:  "{{ FRONT_PROXY_DOMAIN_CONF_SRC }}"
+    dest: "{{ FRONT_PROXY_DOMAIN_CONF_DST }}"
   register: nginx_conf
   notify: restart openresty
 
diff --git a/roles/sys-stk-front-proxy/vars/main.yml b/roles/sys-stk-front-proxy/vars/main.yml
index 2ba1e32e..2665b22d 100644
--- a/roles/sys-stk-front-proxy/vars/main.yml
+++ b/roles/sys-stk-front-proxy/vars/main.yml
@@ -1 +1,2 @@
-configuration_destination:  "{{ [ NGINX.DIRECTORIES.HTTP.SERVERS, domain ~ '.conf'] | path_join }}"
\ No newline at end of file
+FRONT_PROXY_DOMAIN_CONF_DST:  "{{ [ NGINX.DIRECTORIES.HTTP.SERVERS, domain ~ '.conf'] | path_join }}"
+FRONT_PROXY_DOMAIN_CONF_SRC:  "roles/sys-svc-proxy/templates/vhost/{{ vhost_flavour }}.conf.j2"