diff --git a/roles/nginx/README.md b/roles/nginx/README.md index 368e8b8ed..038b84b7e 100644 --- a/roles/nginx/README.md +++ b/roles/nginx/README.md @@ -1,6 +1,6 @@ ### Transition to NGINX -1. Initial testing strategy (December 2019 - January 2020) is to move NGINX to [port 80](https://github.com/iiab/iiab/wiki/IIAB-Networking#list-of-ports--services), and proxy everything to Apache on [port 8090](https://github.com/iiab/iiab/wiki/IIAB-Networking#list-of-ports--services) — creating "Shims" for each IIAB App/Service in *Section iii.* below. +1. Initial testing strategy (December 2019 - February 2020) is to move NGINX to [port 80](https://github.com/iiab/iiab/wiki/IIAB-Networking#list-of-ports--services), and proxy everything to Apache on [port 8090](https://github.com/iiab/iiab/wiki/IIAB-Networking#list-of-ports--services) — creating "Shims" for each IIAB App/Service in *Section iii.* below. Until "Native" NGINX is later implemented for that IIAB App/Service — allowing it to move up to *Section ii.* below. @@ -10,13 +10,14 @@ 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-01-24: +3. Current state of IIAB App/Service migrations as of 2020-02-01: 1. These support "Native" NGINX but ***NOT*** Apache * Admin Console * captiveportal + * IIAB documentation (http://box/info) * osm-vector-maps - * RACHEL-like modules + * 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, change your *primary web server* over to Apache by setting `nginx_enabled: False` 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) (which will [auto-enable Apache](../0-init/tasks/main.yml#L40-L44) for your testing). @@ -31,13 +32,13 @@ * wordpress 3. These support Apache but ***NOT*** "Native" NGINX. They use a "Shim" to [proxy_pass](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/) from NGINX to Apache on port 8090. See [roles/0-init/tasks/main.yml#L40-L44](../0-init/tasks/main.yml#L40-L44) for a list of these IIAB Apps/Services, that auto-enable Apache. - * dokuwiki ([#2056](https://github.com/iiab/iiab/issues/2056)) * elgg * lokole * moodle * nextcloud ([PR #2119](https://github.com/iiab/iiab/pull/2119)) * nodered - 4. Not Yet Dealt With! + 4. These run their own web server, each off of their own unique port(s) (IIAB's has links to these). In future we'd like mnemonic URLs for these: (http://box/calibre, http://box/archive, http://box/kalite) + * calibre (menu goes directly to port 8080) * internetarchive (menu goes directly to port 4244, [PR #2120](https://github.com/iiab/iiab/pull/2120)) * kalite (menu goes directly to ports 8006-8008)