diff --git a/roles/4-server-options/tasks/main.yml b/roles/4-server-options/tasks/main.yml index 330629451..df1d123b9 100644 --- a/roles/4-server-options/tasks/main.yml +++ b/roles/4-server-options/tasks/main.yml @@ -18,7 +18,7 @@ name: pylibs #when: pylibs_install | bool # Flag might be created in future? -# Also run roles/1-prep/tasks/main.yml as required by OpenVPN. +# Also run by roles/1-prep/tasks/main.yml as required by OpenVPN. - name: SSHD include_role: name: sshd diff --git a/roles/nginx/README.md b/roles/nginx/README.md index 5cc1c3d99..e23a8cbb1 100644 --- a/roles/nginx/README.md +++ b/roles/nginx/README.md @@ -10,7 +10,7 @@ 2. Without PHP available via FastCGI, any function at all for PHP-based applications validates NGINX. -3. Current state of IIAB App/Service migrations as of 2020-09-22: +3. Current state of IIAB App/Service migrations as of 2020-09-24: 1. These support "Native" NGINX but ***NOT*** Apache * Admin Console @@ -20,7 +20,7 @@ * OER2Go/RACHEL modules * usb_lib - 2. These support "Native" NGINX ***AND*** Apache, a.k.a. "dual support" for legacy testing (if suitable "Shims" from *Section iii.* below are preserved!) Both "Native" NGINX and "Shim" proxying from NGINX to Apache port 8090 *cannot be enabled simultaneously* for these IIAB Apps/Service. But if you want to attempt their "Shim" proxying legacy testing mode, try setting your *primary web server* to Apache using `apache_install: True` and `apache_enabled: True` (and `nginx_enabled: False` to disable NGINX) in [/etc/iiab/local_vars.yml](http://wiki.laptop.org/go/IIAB/FAQ#What_is_local_vars.yml_and_how_do_I_customize_it.3F) before you install IIAB. You may also need to run `cd /opt/iiab/iiab; ./runrole httpd` since this has been removed from [roles/3-base-server/tasks/main.yml](https://github.com/iiab/iiab/blob/master/roles/3-base-server/tasks/main.yml) + 2. These support "Native" NGINX ***AND*** Apache, a.k.a. "dual support" for legacy testing (if suitable "Shims" from *Section iii.* below are preserved!) Both "Native" NGINX and "Shim" proxying from NGINX to Apache port 8090 *cannot be enabled simultaneously* for these IIAB Apps/Service: * awstats * calibre-web * gitea @@ -48,9 +48,10 @@ * mosquitto * openvpn * pbx [*, requires Apache for now, as in Section iii.] - * phpmyadmin [requires Apache for now, as in Section iii.] + * phpmyadmin [*, requires Apache for now, as in Section iii.] * samba + * sshd * transmission * vnstat -[*] The 3 above starred roles could use improvement, as of 2020-09-22. +[*] The 4 above starred roles could use improvement, as of 2020-09-24. diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 3c5446f78..6ae694e47 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -300,7 +300,7 @@ dansguardian_install: False dansguardian_enabled: False # 2020-02-04: postgresql_install is completely ignored as PostgreSQL is -# installed on demand as a dependency -- by Moodle &/or Pathagar +# installed on demand as a dependency -- by Moodle and/or Pathagar postgresql_install: False postgresql_enabled: False @@ -395,7 +395,7 @@ mosquitto_enabled: False mosquitto_port: 1883 # 2020-02-04: nodejs_install is completely ignored as Node.js is installed on -# demand as a dependency -- by Node-RED, Sugarizer and/or Internet Archive -- +# demand as a dependency -- by Node-RED, Sugarizer and/or Internet Archive nodejs_install: False nodejs_enabled: False # Node.js version used by roles/nodejs/tasks/main.yml for 3 roles: