fix: load role defaults properly
This commit is contained in:
parent
74f558c969
commit
8317bffa1c
2 changed files with 6 additions and 15 deletions
|
|
@ -6,6 +6,10 @@
|
||||||
serial: 2
|
serial: 2
|
||||||
become: true
|
become: true
|
||||||
|
|
||||||
|
# load role defaults
|
||||||
|
vars_files:
|
||||||
|
- "defaults/main.yaml"
|
||||||
|
|
||||||
# import handlers
|
# import handlers
|
||||||
handlers:
|
handlers:
|
||||||
- import_tasks: "handlers/main.yaml"
|
- import_tasks: "handlers/main.yaml"
|
||||||
|
|
|
||||||
|
|
@ -5,25 +5,12 @@
|
||||||
tags: "firewall"
|
tags: "firewall"
|
||||||
block:
|
block:
|
||||||
|
|
||||||
# set debug vars
|
|
||||||
- name: "set debug vars"
|
|
||||||
ansible.builtin.set_fact:
|
|
||||||
firewall_host_rules: []
|
|
||||||
|
|
||||||
# set vars
|
# set vars
|
||||||
- name: "set vars"
|
- name: "set vars"
|
||||||
ansible.builtin.set_fact:
|
ansible.builtin.set_fact:
|
||||||
__firewall_enable: "{{ firewall_enable }}"
|
__firewall_enable: "{{ firewall_enable }}"
|
||||||
__firewall_all_rules: "{{ firewall_basic_rules | union(firewall_host_rules)}}"
|
__firewall_all_rules: "{{ firewall_basic_rules | union(firewall_host_rules)}}"
|
||||||
|
|
||||||
- name: "debug"
|
|
||||||
ansible.builtin.debug:
|
|
||||||
msg: "outside {{ firewall_enable }}"
|
|
||||||
|
|
||||||
- name: "debug"
|
|
||||||
ansible.builtin.debug:
|
|
||||||
msg: "inside {{ __firewall_enable }}"
|
|
||||||
|
|
||||||
# manage firewall for debian
|
# manage firewall for debian
|
||||||
- name: "firewall - debian family"
|
- name: "firewall - debian family"
|
||||||
when: "ansible_os_family == 'Debian'"
|
when: "ansible_os_family == 'Debian'"
|
||||||
|
|
@ -31,7 +18,7 @@
|
||||||
|
|
||||||
# remove and disable firewall
|
# remove and disable firewall
|
||||||
- name: "remove and disable firewall"
|
- name: "remove and disable firewall"
|
||||||
when: '__firewall_enable == "false"'
|
when: "not __firewall_enable"
|
||||||
block:
|
block:
|
||||||
|
|
||||||
# stop service
|
# stop service
|
||||||
|
|
@ -50,7 +37,7 @@
|
||||||
|
|
||||||
# install and enable firewall
|
# install and enable firewall
|
||||||
- name: "install and enable firewall"
|
- name: "install and enable firewall"
|
||||||
when: '__firewall_enable == "true"'
|
when: "__firewall_enable"
|
||||||
block:
|
block:
|
||||||
|
|
||||||
# install ufw
|
# install ufw
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue