Restructured Front Proxy variables

roles/sys-stk-front-proxy/defaults/main.yml

@@ -1,8 +1,5 @@
 # default vhost flavour
-vhost_flavour:        "basic"               # valid: basic, ws_generic
+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"
 
 # Enable / Disable Proxy during development, for faster Debugging
 SYS_STK_FRONT_PROXY_ENABLED: true

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 }}"
+    src:  "{{ FRONT_PROXY_DOMAIN_CONF_SRC }}"
-    dest: "{{ configuration_destination }}"
+    dest: "{{ FRONT_PROXY_DOMAIN_CONF_DST }}"
   register: nginx_conf
   notify: restart openresty
 

roles/sys-stk-front-proxy/vars/main.yml

@@ -1 +1,2 @@
-configuration_destination:  "{{ [ NGINX.DIRECTORIES.HTTP.SERVERS, domain ~ '.conf'] | path_join }}"
+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"