More ansible core 2.20 fixes

Signed-off-by: Jason Rothstein <fdragon@fdragon.org>
This commit is contained in:
2026-05-05 15:01:05 -05:00
parent 42ecc990c6
commit 8d8b193c53
+13 -13
View File
@@ -2,7 +2,7 @@
# tasks file for ensure_apache # tasks file for ensure_apache
- name: 'include variables' - name: 'include variables'
when: when:
- ansible_system == 'Linux' - ansible_facts["system"] == 'Linux'
include_vars: include_vars:
file: '{{ lookup("first_found", findme ) }}' file: '{{ lookup("first_found", findme ) }}'
name: 'ensure_apache' name: 'ensure_apache'
@@ -21,17 +21,17 @@
errors: 'ignore' errors: 'ignore'
- name: 'package discovery' - name: 'package discovery'
when: when:
- ansible_system == 'Linux' - ansible_facts["system"] == 'Linux'
- packages is not defined - ansible_facts["packages"] is not defined
ansible.builtin.package_facts: ansible.builtin.package_facts:
- name: 'service discovery' - name: 'service discovery'
when: when:
- ansible_system == 'Linux' - ansible_facts["system"] == 'Linux'
- services is not defined - services is not defined
ansible.builtin.service_facts: ansible.builtin.service_facts:
- name: 'ensure sysctl' - name: 'ensure sysctl'
when: when:
- ansible_system == 'Linux' - ansible_facts["system"] == 'Linux'
- ensure_apache is defined - ensure_apache is defined
- ensure_apache.sysctl_list is defined - ensure_apache.sysctl_list is defined
- ensure_apache.sysctl_list is iterable - ensure_apache.sysctl_list is iterable
@@ -52,7 +52,7 @@
- 'ensure_apache.service_restart' - 'ensure_apache.service_restart'
- name: 'ensure packages' - name: 'ensure packages'
when: when:
- ansible_system == 'Linux' - ansible_facts["system"] == 'Linux'
- ensure_apache is defined - ensure_apache is defined
- ensure_apache.package_list is defined - ensure_apache.package_list is defined
- ensure_apache.package_list is iterable - ensure_apache.package_list is iterable
@@ -69,7 +69,7 @@
- 'ensure_apache.service_restart' - 'ensure_apache.service_restart'
- name: 'ensure seboolean' - name: 'ensure seboolean'
when: when:
- ansible_system == 'Linux' - ansible_facts["system"] == 'Linux'
- ensure_apache is defined - ensure_apache is defined
- ensure_apache.seboolean_list is defined - ensure_apache.seboolean_list is defined
- ensure_apache.seboolean_list is iterable - ensure_apache.seboolean_list is iterable
@@ -87,7 +87,7 @@
- 'ensure_apache.service_restart' - 'ensure_apache.service_restart'
- name: 'ensure configurations' - name: 'ensure configurations'
when: when:
- ansible_system == 'Linux' - ansible_facts["system"] == 'Linux'
- http_vhost is defined - http_vhost is defined
- ensure_apache is defined - ensure_apache is defined
- ensure_apache.template_list is defined - ensure_apache.template_list is defined
@@ -113,7 +113,7 @@
- 'ensure_apache.service_restart' - 'ensure_apache.service_restart'
- name: 'ensure firewall' - name: 'ensure firewall'
when: when:
- ansible_system == 'Linux' - ansible_facts["system"] == 'Linux'
- packages["firewalld"] is defined - packages["firewalld"] is defined
- packages["python3-firewall"] is defined - packages["python3-firewall"] is defined
- ensure_apache is defined - ensure_apache is defined
@@ -133,7 +133,7 @@
- 'ensure_apache.service_restart' - 'ensure_apache.service_restart'
- name: 'ensure permissions' - name: 'ensure permissions'
when: when:
- ansible_system == 'Linux' - ansible_facts["system"] == 'Linux'
- ensure_apache is defined - ensure_apache is defined
- http_vhost is defined - http_vhost is defined
- http_vhost is iterable - http_vhost is iterable
@@ -164,7 +164,7 @@
- 'ensure_apache.service_restart' - 'ensure_apache.service_restart'
- name: 'ensure vhost document roots' - name: 'ensure vhost document roots'
when: when:
- ansible_system == 'Linux' - ansible_facts["system"] == 'Linux'
- ensure_apache is defined - ensure_apache is defined
- http_vhost is defined - http_vhost is defined
- http_vhost is iterable - http_vhost is iterable
@@ -183,7 +183,7 @@
- 'ensure_apache.service_restart' - 'ensure_apache.service_restart'
- name: 'ensure website content from git repos' - name: 'ensure website content from git repos'
when: when:
- ansible_system == 'Linux' - ansible_facts["system"] == 'Linux'
- ensure_apache is defined - ensure_apache is defined
- http_vhost is defined - http_vhost is defined
- http_vhost is iterable - http_vhost is iterable
@@ -203,7 +203,7 @@
- 'ensure_apache.service_restart' - 'ensure_apache.service_restart'
- name: 'ensure services' - name: 'ensure services'
when: when:
- ansible_system == 'Linux' - ansible_facts["system"] == 'Linux'
- ensure_apache is defined - ensure_apache is defined
- ensure_apache.service_list is defined - ensure_apache.service_list is defined
- ensure_apache.service_list is iterable - ensure_apache.service_list is iterable