From 725a7df59b2e2ebe883949726d62a92be92a6a64 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sat, 4 Jan 2020 03:14:54 -0600 Subject: [PATCH 1/4] use set_fact apache_enabled: True for apache apps --- roles/0-init/tasks/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/roles/0-init/tasks/main.yml b/roles/0-init/tasks/main.yml index 79b09ae92..e0d7d915d 100644 --- a/roles/0-init/tasks/main.yml +++ b/roles/0-init/tasks/main.yml @@ -105,6 +105,11 @@ gui_port: 443 when: adm_cons_force_ssl | bool +- name: Turn on Apache for (dokuwiki elgg lokole moodle nodered nextcloud) + set_fact: + apache_enabled: True + when: dokuwiki_install or elgg_install or lokole_install or moodle_install or nodered_install or nextcloud_install + - name: Turn on both vars for MySQL (mandatory in Stage 3!) set_fact: mysql_install: True From 60ddaf593caf2079c1fa1babbc7a7a942292cad4 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sat, 4 Jan 2020 03:18:13 -0600 Subject: [PATCH 2/4] default apache_enabled: False --- vars/default_vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index d4c4d04bb..f363a9e18 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -232,7 +232,7 @@ admin_console_enabled: True # variables related to introduction of nginx # apache apache_install: True -apache_enabled: True +apache_enabled: False apache_port: "8090" apache_interface: "127.0.0.1" # The following variable, if True, allows Admin Console to poweroff IIAB From 0cc20fbaf3cc800cf58b41b10343ed307f0d1e70 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 12 Jan 2020 12:32:01 -0500 Subject: [PATCH 3/4] Enable Apache in 0-init/tasks/main.yml if svcs need it --- roles/0-init/tasks/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/0-init/tasks/main.yml b/roles/0-init/tasks/main.yml index e0d7d915d..53fedcd50 100644 --- a/roles/0-init/tasks/main.yml +++ b/roles/0-init/tasks/main.yml @@ -105,10 +105,11 @@ gui_port: 443 when: adm_cons_force_ssl | bool -- name: Turn on Apache for (dokuwiki elgg lokole moodle nodered nextcloud) +# SEE: https://github.com/iiab/iiab/blob/master/roles/nginx/README.md +- name: Enable Apache if any of {DokuWiki, Elgg, Lokole, Moodle, Nextcloud, Node-RED} are set to install set_fact: apache_enabled: True - when: dokuwiki_install or elgg_install or lokole_install or moodle_install or nodered_install or nextcloud_install + when: dokuwiki_install or elgg_install or lokole_install or moodle_install or nextcloud_install or nodered_install - name: Turn on both vars for MySQL (mandatory in Stage 3!) set_fact: From 8db70d90842a9cfd705e5964f2f3034eacb8a2f7 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 12 Jan 2020 12:37:41 -0500 Subject: [PATCH 4/4] Clarify Apache's changing role in roles/nginx/README.md --- roles/nginx/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/nginx/README.md b/roles/nginx/README.md index e49e46418..ec457ba0a 100644 --- a/roles/nginx/README.md +++ b/roles/nginx/README.md @@ -14,7 +14,7 @@ * usb-lib * wordpress - 2. Dual support, see https://github.com/iiab/iiab/blob/master/roles/nginx/tasks/only_nginx.yml + 2. Dual support, see [roles/nginx/tasks/only_nginx.yml](tasks/only_nginx.yml) * awstats ([#2124](https://github.com/iiab/iiab/issues/2124)) * calibre-web * gitea @@ -22,7 +22,7 @@ * kolibri * sugarizer - 3. Still proxied to Apache, see [PR #2131](https://github.com/iiab/iiab/pull/2131) & https://github.com/iiab/iiab/blob/master/roles/nginx/tasks/uses_apache.yml + 3. Still proxied to Apache, see [roles/0-init/tasks/main.yml#L108-L112](../0-init/tasks/main.yml#L108-L112) & [roles/nginx/tasks/uses_apache.yml](tasks/uses_apache.yml) * dokuwiki ([#2056](https://github.com/iiab/iiab/issues/2056)) * elgg * lokole