From 7eac9374bc50caa52d7a76f4da4d1f31adb634dd Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Thu, 27 Nov 2025 21:50:39 +0100 Subject: [PATCH] Implemented loading of javascript.js und javascript.js.j2 files --- roles/sys-front-inj-javascript/tasks/main.yml | 13 ++++++++++++- roles/sys-front-inj-javascript/vars/main.yml | 1 - 2 files changed, 12 insertions(+), 2 deletions(-) delete mode 100644 roles/sys-front-inj-javascript/vars/main.yml diff --git a/roles/sys-front-inj-javascript/tasks/main.yml b/roles/sys-front-inj-javascript/tasks/main.yml index 01de05ca..d126479e 100644 --- a/roles/sys-front-inj-javascript/tasks/main.yml +++ b/roles/sys-front-inj-javascript/tasks/main.yml @@ -1,8 +1,19 @@ # run_once_sys_front_inj_javascript: deactivated +- name: "Select JavaScript file path for '{{ application_id }}'" + set_fact: + javascript_file_custom: >- + {{ (application_id | abs_role_path_by_application_id ~ '/templates/javascript.js.j2') + if lookup('fileglob', application_id | abs_role_path_by_application_id ~ '/templates/javascript.js.j2') + else application_id | abs_role_path_by_application_id ~ '/files/javascript.js' }} + - name: "Load JavaScript code for '{{ application_id }}'" set_fact: - javascript_code: "{{ lookup('template', modifier_javascript_template_file) }}" + javascript_code: >- + {{ lookup( + javascript_file_custom.endswith('.j2') | ternary('template', 'file'), + javascript_file_custom + ) }} - name: "Collapse Javascript code into one-liner for '{{ application_id }}'" set_fact: diff --git a/roles/sys-front-inj-javascript/vars/main.yml b/roles/sys-front-inj-javascript/vars/main.yml deleted file mode 100644 index 1e72f9bc..00000000 --- a/roles/sys-front-inj-javascript/vars/main.yml +++ /dev/null @@ -1 +0,0 @@ -modifier_javascript_template_file: "{{ application_id | abs_role_path_by_application_id }}/templates/javascript.js.j2" \ No newline at end of file