mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2025-12-08 10:26:35 +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
46 lines
1.8 KiB
YAML
46 lines
1.8 KiB
YAML
- block:
|
|
- name: Include dependency 'sys-svc-webserver-https'
|
|
include_role:
|
|
name: sys-svc-webserver-https
|
|
when: run_once_sys_svc_webserver_https is not defined
|
|
- include_tasks: utils/once/finalize.yml
|
|
when: run_once_sys_svc_certs is not defined
|
|
|
|
- name: "Include flavor '{{ CERTBOT_FLAVOR }}' for '{{ domain }}'"
|
|
include_tasks: "{{ [role_path, 'tasks/flavors', CERTBOT_FLAVOR ~'.yml'] | path_join }}"
|
|
|
|
#- name: "Cleanup dedicated cert for '{{ domain }}'"
|
|
# command: >-
|
|
# certbot delete --cert-name {{ domain }} --non-interactive
|
|
# when:
|
|
# - MODE_CLEANUP | bool
|
|
# # Cleanup mode is enabled
|
|
# - CERTBOT_FLAVOR != 'dedicated'
|
|
# # Wildcard certificate is enabled
|
|
# - domain.split('.') | length == (PRIMARY_DOMAIN.split('.') | length + 1) and domain.endswith(PRIMARY_DOMAIN)
|
|
# # AND: The domain is a direct first-level subdomain of the primary domain
|
|
# - domain != PRIMARY_DOMAIN
|
|
# # The domain is not the primary domain
|
|
# register: certbot_result
|
|
# failed_when: certbot_result.rc != 0 and ("No certificate found with name" not in certbot_result.stderr)
|
|
# changed_when: certbot_result.rc == 0 and ("No certificate found with name" not in certbot_result.stderr)
|
|
|
|
- name: "Find SSL cert folder for '{{ domain }}'"
|
|
cert_folder_find:
|
|
domain: "{{ domain }}"
|
|
cert_base_path: "{{ LETSENCRYPT_LIVE_PATH }}"
|
|
debug: "{{ MODE_DEBUG | bool }}"
|
|
register: cert_folder_result
|
|
delegate_to: "{{ inventory_hostname }}"
|
|
changed_when: false
|
|
|
|
- name: "Set ssl_cert_folder fact to '{{ cert_folder_result.folder }}'"
|
|
set_fact:
|
|
ssl_cert_folder: "{{ cert_folder_result.folder }}"
|
|
changed_when: false
|
|
|
|
- name: "Ensure ssl_cert_folder is set for domain {{ domain }}"
|
|
fail:
|
|
msg: "No certificate folder found for domain {{ domain }}"
|
|
when: ssl_cert_folder is undefined or ssl_cert_folder is none
|