mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2025-12-08 18:35:11 +00:00
Kevin Veen-Birkenbach
716ebef33b
This commit updates multiple roles to ensure compatibility with Ansible 2.20. Several include paths and task-loading mechanisms required adjustments, as Ansible 2.20 applies stricter evaluation rules for complex Jinja expressions and no longer resolves certain relative include paths the way Ansible 2.18 did. Key changes: - Replaced legacy once_finalize.yml and once_flag.yml with the new structure under tasks/utils/once/finalize.yml and tasks/utils/once/flag.yml. - Updated all include_tasks statements to use 'path_join' with playbook_dir, ensuring deterministic and absolute file resolution across roles. - Fixed all network helper includes by converting direct relative paths such as 'roles/docker-compose/tasks/utils/network.yml' to proper Jinja-evaluated paths. - Normalized MATOMO_* variable names for consistency with the updated variable scope behavior in Ansible 2.20. - Removed deprecated patterns that were implicitly supported in Ansible 2.18 but break under the more strict variable and path resolution model in 2.20. These changes are part of the full migration step required to ensure the infinito-nexus roles remain stable, deterministic, and forward-compatible with Ansible 2.20. Details of the discussion and reasoning can be found in this conversation: https://chatgpt.com/share/69300a8d-24d4-800f-bec0-e895a695618a
58 lines
1.8 KiB
YAML
58 lines
1.8 KiB
YAML
- block:
|
|
- name: Include dependency 'sys-svc-webserver-core'
|
|
include_role:
|
|
name: sys-svc-webserver-core
|
|
vars:
|
|
docker_pull_git_repository: false # Deactivated here to don't inhire this
|
|
when: run_once_sys_svc_webserver_core is not defined
|
|
- include_tasks: utils/once/finalize.yml
|
|
when: run_once_sys_front_inj_all is not defined
|
|
|
|
- name: Build inj_enabled for '{{ domain }}'"
|
|
set_fact:
|
|
inj_enabled: "{{ applications | inj_enabled(application_id, SRV_WEB_INJ_COMP_FEATURES_ALL) }}"
|
|
|
|
- name: "Included dependent services"
|
|
include_tasks: 01_dependencies.yml
|
|
vars:
|
|
proxy_extra_configuration: ""
|
|
docker_compose_flush_handlers: true
|
|
|
|
- name: Reinitialize 'inj_enabled' for '{{ domain }}', after loading the required webservices
|
|
set_fact:
|
|
inj_enabled: "{{ applications | inj_enabled(application_id, SRV_WEB_INJ_COMP_FEATURES_ALL) }}"
|
|
inj_head_features: "{{ SRV_WEB_INJ_COMP_FEATURES_ALL | inj_features('head') }}"
|
|
inj_body_features: "{{ SRV_WEB_INJ_COMP_FEATURES_ALL | inj_features('body') }}"
|
|
|
|
- name: "Load CDN Service for '{{ domain }}'"
|
|
include_role:
|
|
name: sys-svc-cdn
|
|
public: true
|
|
|
|
- name: "Activate logout proxy for '{{ domain }}'"
|
|
include_role:
|
|
name: sys-front-inj-logout
|
|
public: true
|
|
when: inj_enabled.logout
|
|
|
|
- name: "Activate Desktop iFrame notifier for '{{ domain }}'"
|
|
include_role:
|
|
name: sys-front-inj-desktop
|
|
public: true
|
|
when: inj_enabled.desktop
|
|
|
|
- name: "Activate Corporate CSS for '{{ domain }}'"
|
|
include_role:
|
|
name: sys-front-inj-css
|
|
when: inj_enabled.css
|
|
|
|
- name: "Activate Matomo Tracking for '{{ domain }}'"
|
|
include_role:
|
|
name: sys-front-inj-matomo
|
|
when: inj_enabled.matomo
|
|
|
|
- name: "Activate Javascript for '{{ domain }}'"
|
|
include_role:
|
|
name: sys-front-inj-javascript
|
|
when: inj_enabled.javascript
|