diff --git a/roles/0-init/tasks/main.yml b/roles/0-init/tasks/main.yml index fee213432..8005f6f55 100644 --- a/roles/0-init/tasks/main.yml +++ b/roles/0-init/tasks/main.yml @@ -37,22 +37,23 @@ include_tasks: validate_vars.yml # SEE: https://github.com/iiab/iiab/blob/master/roles/nginx/README.md -- name: "Set 'apache_enabled: True' if any of {DokuWiki, Elgg, Lokole, Moodle, Nextcloud, Node-RED} are set to install" +- name: "Set 'apache_install: True' and 'apache_enabled: True' if NGINX is set not be enabled OR if any of {DokuWiki, Elgg, Lokole, Moodle, Nextcloud, Node-RED} are set to install" set_fact: + apache_install: True apache_enabled: True - when: dokuwiki_install or elgg_install or lokole_install or moodle_install or nextcloud_install or nodered_install + when: not nginx_enabled or dokuwiki_install or elgg_install or lokole_install or moodle_install or nextcloud_install or nodered_install # #- name: "Verify 'apache_install: True' and 'apache_enabled: True' if any of {DokuWiki, Elgg, Lokole, Moodle, Nextcloud, Node-RED} are set to install" # assert: # that: apache_install and apache_enabled or not (dokuwiki_install or elgg_install or lokole_install or moodle_install or nextcloud_install or nodered_install) # fail_msg: "PLEASE CONFIRM 'apache_install: True' AND 'apache_enable: True' IF YOU'RE TRYING TO INSTALL ANY OF {dokuwiki, elgg, lokole, moodle, nextcloud, nodered} e.g. IN: /etc/iiab/local_vars.yml" # quiet: yes - -- name: "Verify 'apache_install: True' and 'apache_enabled: True' if 'nginx_enabled: False' -- e.g. for Apache testing of older playbooks lacking full NGINX support" - assert: - that: apache_install and apache_enabled or nginx_enabled - fail_msg: "PLEASE CONFIRM 'apache_install: True' AND 'apache_enable: True' IF 'nginx_enabled: False' e.g. IN: /etc/iiab/local_vars.yml" - quiet: yes +# +#- name: "Verify 'apache_install: True' and 'apache_enabled: True' if 'nginx_enabled: False' -- e.g. for Apache testing of older playbooks lacking full NGINX support" +# assert: +# that: apache_install and apache_enabled or nginx_enabled +# fail_msg: "PLEASE CONFIRM 'apache_install: True' AND 'apache_enable: True' IF 'nginx_enabled: False' e.g. IN: /etc/iiab/local_vars.yml" +# quiet: yes - name: Set top-level variables from local_facts for convenience set_fact: