mirror of
https://github.com/iiab/iiab.git
synced 2025-03-09 15:40:17 +00:00
Update captiveportal/tasks/main.yml
This commit is contained in:
parent
845a20fba7
commit
7fc26df163
1 changed files with 11 additions and 7 deletions
|
@ -2,7 +2,7 @@
|
||||||
# I want to perform input validation for Ansible playbooks"
|
# I want to perform input validation for Ansible playbooks"
|
||||||
# https://stackoverflow.com/questions/46664127/how-do-i-fail-a-task-in-ansible-if-the-variable-contains-a-boolean-value-i-want/46667499#46667499
|
# https://stackoverflow.com/questions/46664127/how-do-i-fail-a-task-in-ansible-if-the-variable-contains-a-boolean-value-i-want/46667499#46667499
|
||||||
|
|
||||||
# If 0-init/tasks/validate_vars.yml has DEFINITELY been run (?) perhaps no need
|
# We assume 0-init/tasks/validate_vars.yml has DEFINITELY been run, so no need
|
||||||
# to re-check whether vars are defined here. As Ansible vars cannot be unset:
|
# to re-check whether vars are defined here. As Ansible vars cannot be unset:
|
||||||
# https://serverfault.com/questions/856729/how-to-destroy-delete-unset-a-variable-value-in-ansible
|
# https://serverfault.com/questions/856729/how-to-destroy-delete-unset-a-variable-value-in-ansible
|
||||||
|
|
||||||
|
@ -11,23 +11,27 @@
|
||||||
that: captiveportal_install is sameas true
|
that: captiveportal_install is sameas true
|
||||||
fail_msg: "PLEASE SET 'captiveportal_install: True' e.g. IN: /etc/iiab/local_vars.yml"
|
fail_msg: "PLEASE SET 'captiveportal_install: True' e.g. IN: /etc/iiab/local_vars.yml"
|
||||||
quiet: yes
|
quiet: yes
|
||||||
#that: captiveportal_install is defined and captiveportal_install is sameas true
|
|
||||||
#success_msg: captiveportal_install is defined and captiveportal_install is sameas true
|
|
||||||
|
|
||||||
- name: Assert that "captiveportal_enabled | type_debug == 'bool'" (boolean not string etc)
|
- name: Assert that "captiveportal_enabled | type_debug == 'bool'" (boolean not string etc)
|
||||||
assert:
|
assert:
|
||||||
that: captiveportal_enabled | type_debug == 'bool'
|
that: captiveportal_enabled | type_debug == 'bool'
|
||||||
fail_msg: "PLEASE GIVE VARIABLE 'captiveportal_enabled' A PROPER (UNQUOTED) BOOLEAN VALUE e.g. IN: /etc/iiab/local_vars.yml"
|
fail_msg: "PLEASE GIVE VARIABLE 'captiveportal_enabled' A PROPER (UNQUOTED) BOOLEAN VALUE e.g. IN: /etc/iiab/local_vars.yml"
|
||||||
quiet: yes
|
quiet: yes
|
||||||
#that: captiveportal_enabled is defined and captiveportal_enabled | type_debug == 'bool'
|
|
||||||
#success_msg: captiveportal_enabled is defined and captiveportal_enabled | type_debug == 'bool'
|
|
||||||
|
|
||||||
- name: Install Captive Portal if 'captiveportal_installed' is not defined in {{ iiab_state_file }} # /etc/iiab/iiab_state.yml
|
- name: Install Captive Portal if 'captiveportal_installed' is not defined in {{ iiab_state_file }} # /etc/iiab/iiab_state.yml
|
||||||
include_tasks: install.yml
|
include_tasks: install.yml
|
||||||
when: captiveportal_installed is undefined
|
when: captiveportal_installed is undefined
|
||||||
|
|
||||||
- name: Enable or Disable Captive Portal
|
|
||||||
include_tasks: enable-or-disable.yml
|
- name: Enable/Disable/Restart Apache if primary
|
||||||
|
include_tasks: apache.yml
|
||||||
|
when: not nginx_enabled
|
||||||
|
|
||||||
|
- name: Enable/Disable/Restart NGINX if primary
|
||||||
|
include_tasks: nginx.yml
|
||||||
|
when: nginx_enabled | bool
|
||||||
|
|
||||||
|
|
||||||
- name: Add 'captiveportal' variable values to {{ iiab_ini_file }}
|
- name: Add 'captiveportal' variable values to {{ iiab_ini_file }}
|
||||||
ini_file:
|
ini_file:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue