diff --git a/roles/nginx/README.md b/roles/nginx/README.md index c4a3c3cef..2a9468c58 100644 --- a/roles/nginx/README.md +++ b/roles/nginx/README.md @@ -1,23 +1,23 @@ ### Transition to NGINX -1. Initial testing strategy is to move NGINX to port 80, and proxy everything to Apache on port 8090 — creating "Shims" for each IIAB app/service/playbook in *Section iii.* below. +1. Initial testing strategy is to move NGINX to port 80, and proxy everything to Apache on port 8090 — creating "Shims" for each IIAB App/Service in *Section iii.* below. - Until "Native" NGINX is later implemented for that IIAB app/service/playbook — allowing it to move up to *Section ii.* below. + Until "Native" NGINX is later implemented for that IIAB App/Service — allowing it to move up to *Section ii.* below. And potentially later moving it up to *Section i.* if its Apache support is dropped! 2. Without PHP available via FastCGI, any function at all for PHP-based applications validates NGINX. -3. Current state as of 2020-01-23... +3. Current state IIAB App/Service migrations as of 2020-01-23... - 1. Supports "Native" NGINX but ***NOT*** Apache + 1. These support "Native" NGINX but ***NOT*** Apache * Admin Console * captiveportal * osm-vector-maps * RACHEL-like modules * usb-lib - 2. Supports "Native" NGINX ***AND*** Apache, a.k.a. "dual support" for legacy testing, which can be attempted by setting 'nginx_enabled: False' in /etc/iiab/local_vars.yml (if "Shims" from *Section iii.* below are preserved!) + 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, [auto-enable Apache](../0-init/tasks/main.yml#L40-L44) 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) * awstats * calibre-web * gitea @@ -28,7 +28,7 @@ * sugarizer * wordpress - 3. Supports Apache but ***NOT*** NGINX, proxied by an NGINX "Shim" (see [roles/0-init/tasks/main.yml#L39-L49](../0-init/tasks/main.yml#L39-L49) for a list of those IIAB apps/services that auto-enable Apache) + 3. These support Apache but ***NOT*** "Native" NGINX. These 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