From 15a42dcd7f39fed409262e564de866456de84897 Mon Sep 17 00:00:00 2001
From: root <holta@users.noreply.github.com>
Date: Sun, 8 Aug 2021 10:54:27 -0400
Subject: [PATCH] Fix nginx/templates/apache-ports.conf + Update
 nginx/README.md

---
 roles/nginx/README.md                                | 12 ++++++------
 roles/nginx/tasks/install.yml                        |  2 +-
 .../{apache-ports.conf.j2 => apache-ports.conf}      |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename roles/nginx/templates/{apache-ports.conf.j2 => apache-ports.conf} (91%)

diff --git a/roles/nginx/README.md b/roles/nginx/README.md
index 758f6a1e4..fd70c279e 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 2021-07-24: *(SEE ALSO [#2762](https://github.com/iiab/iiab/issues/2762))*
+3. Current state of IIAB App/Service migrations as of 2021-08-08: *(SEE ALSO [#2762](https://github.com/iiab/iiab/issues/2762))*
 
    1. These support "Native" NGINX but ***NOT*** Apache
 
@@ -37,11 +37,11 @@
 
    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)-->
 
-      * NONE: Apache support is being fully removed starting 2021-07-06 ([PR #2850](https://github.com/iiab/iiab/pull/2850))
+      * **NONE: Apache support is now fully REMOVED as of 2021-08-08** ([PR #2850](https://github.com/iiab/iiab/pull/2850))
 
    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/3-base-server/tasks/main.yml#L11](../3-base-server/tasks/main.yml#L11) for a list of ~6 IIAB Apps/Services that auto-enable Apache.
 
-      * elgg [*, should be deprecated, or considered for a complete overhaul from ancient Elgg 2.x to 4.x?]
+      * elgg [deprecated -- consider assisting with a complete overhaul from Elgg 2.x to 4.x ?]
 
    4. These each run their own web server or non-web / backend services, e.g. off of their own [unique port(s)](https://github.com/iiab/iiab/wiki/IIAB-Networking#list-of-ports--services) (IIAB home pages link directly to these destinations).  In future we'd like mnemonic URL's for all of these: (e.g. http://box/calibre, http://box/archive, http://box/kalite)
 
@@ -53,11 +53,11 @@
       * minetest
       * mosquitto
       * openvpn
-      * pbx [*, requires Apache for now, as in Section iii., [PR #2862](https://github.com/iiab/iiab/pull/2862)]
+      * pbx [*, recommends Apache for now, as in Section iii., [#2914](https://github.com/iiab/iiab/issues/2914)]
       * phpmyadmin [*, requires Apache for now, as in Section iii.]
-      * samba
+      * samba [*]
       * sshd
       * transmission
       * vnstat
 
-[*] The 4 above starred roles could use improvement, as of 2021-07-24.
+[*] The 4 above starred roles could use improvement, as of 2021-08-08.
diff --git a/roles/nginx/tasks/install.yml b/roles/nginx/tasks/install.yml
index 6a33254d5..5a0285af6 100644
--- a/roles/nginx/tasks/install.yml
+++ b/roles/nginx/tasks/install.yml
@@ -50,7 +50,7 @@
     - { src: 'server.conf.j2', dest: '/etc/nginx/server.conf' }
     - { src: 'nginx.conf.j2', dest: '/etc/nginx/nginx.conf' }
     - { src: 'mime.types.j2', dest: '/etc/nginx/mime.types' }
-    - { src: 'apache-ports.conf.j2', dest: '/etc/{{ apache_service }}/ports.conf' }    # 2021-08-08: Restored from enable-or-disable.yml
+    - { src: 'apache-ports.conf', dest: '/etc/{{ apache_service }}/ports.conf' }    # 2021-08-08: Restored from enable-or-disable.yml
     # - { src: 'iiab.conf.j2', dest: "{{ nginx_conf_dir }}/iiab.conf" }    # Moved into homepage.yml, invoked later by roles/www_options/tasks/main.yml (see below!)
 
 - debug:
diff --git a/roles/nginx/templates/apache-ports.conf.j2 b/roles/nginx/templates/apache-ports.conf
similarity index 91%
rename from roles/nginx/templates/apache-ports.conf.j2
rename to roles/nginx/templates/apache-ports.conf
index a10d24122..3ed5e9035 100644
--- a/roles/nginx/templates/apache-ports.conf.j2
+++ b/roles/nginx/templates/apache-ports.conf
@@ -6,7 +6,7 @@
 #Listen 80
 
 # IIAB NGINX proxying to legacy svcs (Dec 2019 - Aug 2021)
-#Listen 127.0.0.1:{{ apache_port }}
+#Listen 127.0.0.1:8090
 
 #<IfModule ssl_module>
 #	Listen 443