Merge branch 'shims' of https://github.com/holta/iiab into shims

roles/0-init/tasks/main.yml

@@ -105,6 +105,12 @@
     gui_port: 443
   when: adm_cons_force_ssl | bool
 
+# 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 nextcloud_install or nodered_install
+
 - name: Turn on both vars for MySQL (mandatory in Stage 3!)
   set_fact:
     mysql_install: True

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

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