From b31eb6541c3fa757a6c4d747e7bc4e64190a31f4 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Sat, 28 Nov 2020 09:58:16 -0500
Subject: [PATCH 01/21] WIP: AppArmor works with IIAB on Debian 10/11, so is
 this now also true on Ubuntu?

---
 roles/1-prep/tasks/main.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/roles/1-prep/tasks/main.yml b/roles/1-prep/tasks/main.yml
index bb499df5c..4cf2ba2cd 100644
--- a/roles/1-prep/tasks/main.yml
+++ b/roles/1-prep/tasks/main.yml
@@ -97,13 +97,14 @@
 # https://packages.debian.org/buster/apparmor
 # Curiously this has NOT stopped IIAB 7.0/master from working on Debian 10
 # pre-releases, during @floydianslips' March 2019 testing anyway!  SEE #1387
-- name: Disable AppArmor -- override OS default (ubuntu)
-  systemd:
-    name: apparmor
-    enabled: False
-    state: stopped
-  when: is_ubuntu
-  ignore_errors: True
+
+#- name: Disable AppArmor -- override OS default (ubuntu)
+#  systemd:
+#    name: apparmor
+#    enabled: False
+#    state: stopped
+#  when: is_ubuntu
+#  ignore_errors: True
 
 #- name: Disable SELinux on next boot (OS's other than debuntu)
 #  selinux:

From c849249ca4cc75389e506955bebbed6f63e27f56 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Sat, 28 Nov 2020 15:18:19 -0500
Subject: [PATCH 02/21] 1-prep/tasks/main.yml sections: less doomscrolling,
 more readability

---
 roles/1-prep/tasks/main.yml | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/roles/1-prep/tasks/main.yml b/roles/1-prep/tasks/main.yml
index 4cf2ba2cd..9953016bd 100644
--- a/roles/1-prep/tasks/main.yml
+++ b/roles/1-prep/tasks/main.yml
@@ -7,6 +7,7 @@
   include_tasks: roles/network/tasks/dnsmasq.yml
   #when: dnsmasq_install    # Flag might be used in future?
 
+
 - name: Install uuid-runtime package (debuntu)
   package:
     name: 
@@ -37,13 +38,6 @@
   set_fact:
     uuid: "{{ stored_uuid.stdout_lines[0] }}"
 
-#- name: Does directory /ro exist? (indicating OS is Ubermix)
-#  stat:
-#    path: /ro
-#  register: ro_dir
-
-#- debug:
-#    var: ro_dir
 
 - name: Does 'ubermix' exist in /etc/lsb-release?
   shell: grep -i ubermix /etc/lsb-release    # Pipe to cat to avoid red errors?
@@ -52,9 +46,6 @@
   #ignore_errors: True
   #check_mode: no
 
-#- debug:
-#    var: grep_ubermix
-
 - name: If so, install /etc/tmpfiles.d/iiab.conf to create /var/log subdirs on each boot, so {Apache, MongoDB, Munin} run on Ubermix
   copy:
     src: roles/1-prep/files/iiab.conf
@@ -64,7 +55,6 @@
     # mode: '0644'
     force: yes
   when: grep_ubermix.rc == 0    # 1 if absent in file, 2 if file doesn't exist
-  #when: ro_dir.stat.exists
 
 # 2020-03-19: for KA Lite, but moved from roles/kalite/tasks/install.yml
 # This effectively does nothing at all on Ubuntu & Raspbian, where libgeos-*
@@ -75,6 +65,7 @@
   shell: apt -y remove "libgeos-*"
   when: grep_ubermix.rc == 0    # 1 if absent in file, 2 if file doesn't exist
 
+
 # Required by OpenVPN below.  Also run by roles/4-server-options/tasks/main.yml
 - name: SSHD
   include_role:
@@ -91,6 +82,7 @@
     name: openvpn
   when: openvpn_install
 
+
 # Debian 10 "Buster" is apparently enabling AppArmor in 2019:
 # https://wiki.debian.org/AppArmor/Progress
 # https://wiki.debian.org/AppArmor/HowToUse
@@ -116,6 +108,7 @@
 #  command: setenforce Permissive
 #  when: not is_debuntu and selinux_disabled is defined and selinux_disabled.changed
 
+
 ##  DISCOVER PLATFORMS ######
 # Put conditional actions for hardware platforms here
 - include_tasks: raspberry_pi.yml
@@ -133,6 +126,7 @@
     timeout: "{{ download_timeout }}"
   when: internet_available and usb_NUC6.stdout|int > 0
 
+
 # this script can be sourced to get IIAB location
 - name: Recording STAGE 1 HAS COMPLETED ============================
   template:

From 850aedd8083ab97cd106ed8138715887e3ac8596 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Sat, 28 Nov 2020 17:09:04 -0500
Subject: [PATCH 03/21] scripts/ansible: --force-with-deps -r collections.yml
 -p /usr/share/ansible/collections

---
 scripts/ansible | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/scripts/ansible b/scripts/ansible
index bfd02e073..4336fa1c1 100755
--- a/scripts/ansible
+++ b/scripts/ansible
@@ -95,12 +95,7 @@ $APT_PATH/apt -y --allow-downgrades install ansible-base \
 # upgrade of collection and dependencies it pulls in.  Note Ansible may support
 # upgrading all collections cleanly in future.  See PR #2652 (links) & PR #2653
 echo -e "\n\nIIAB requires these 3 Ansible Collections: (we upgrade them here if possible!)\n"
-ansible-galaxy collection install --force-with-deps community.general
-ansible-galaxy collection install --force-with-deps community.mysql
-ansible-galaxy collection install --force-with-deps ansible.posix # For 3 below
-# selinux WAS in /opt/iiab/iiab/roles/1-prep/tasks/main.yml
-# sysctl in      /opt/iiab/iiab/roles/2-common/tasks/main.yml
-# synchronize in /opt/iiab/iiab-admin-console/roles/js-menu/tasks/main.yml
+ansible-galaxy collection install --force-with-deps -r collections.yml -p /usr/share/ansible/collections
 
 echo -e "\n\nCreating/verifying directory /etc/ansible & installing /etc/ansible/hosts\n"
 mkdir -p /etc/ansible

From bca8d56457c90a111701be74bc0832a410439c24 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Sat, 28 Nov 2020 17:19:58 -0500
Subject: [PATCH 04/21] Create collections.yml (listing the Ansible Collections
 that IIAB requires)

---
 collections.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 collections.yml

diff --git a/collections.yml b/collections.yml
new file mode 100644
index 000000000..77c100ee3
--- /dev/null
+++ b/collections.yml
@@ -0,0 +1,13 @@
+# IIAB requires the Ansible Collections listed below.  Explanations here:
+# http://FAQ.IIAB.IO > "What is Ansible and what version should I use?"
+# https://github.com/iiab/iiab/blob/master/scripts/ansible.md
+
+---
+collections:
+  - name: community.general
+  - name: community.mysql
+  - name: ansible.posix    # 2020-11-28: For ~3 modules below...
+
+# selinux WAS in /opt/iiab/iiab/roles/1-prep/tasks/main.yml
+# sysctl      in /opt/iiab/iiab/roles/2-common/tasks/main.yml
+# synchronize in /opt/iiab/iiab-admin-console/roles/js-menu/tasks/main.yml

From 55f07071873e81f029802560fd8c1a9907bb39bb Mon Sep 17 00:00:00 2001
From: root <holta@users.noreply.github.com>
Date: Sat, 28 Nov 2020 22:39:00 +0000
Subject: [PATCH 05/21] scripts/ansible: Explain
 /usr/share/ansible/collections/ansible_collections

---
 scripts/ansible | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/ansible b/scripts/ansible
index 4336fa1c1..81facc937 100755
--- a/scripts/ansible
+++ b/scripts/ansible
@@ -96,6 +96,10 @@ $APT_PATH/apt -y --allow-downgrades install ansible-base \
 # upgrading all collections cleanly in future.  See PR #2652 (links) & PR #2653
 echo -e "\n\nIIAB requires these 3 Ansible Collections: (we upgrade them here if possible!)\n"
 ansible-galaxy collection install --force-with-deps -r collections.yml -p /usr/share/ansible/collections
+# 2020-11-28: The ~3 Ansible Collections (~37MB) used by IIAB used to be here:
+#    /root/.ansible/collections/ansible_collections
+# But going forward they'll be stored here:
+#    /usr/share/ansible/collections/ansible_collections
 
 echo -e "\n\nCreating/verifying directory /etc/ansible & installing /etc/ansible/hosts\n"
 mkdir -p /etc/ansible

From 105bbdc0b9b02e453fba583dc1e8650662dec91f Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Sat, 28 Nov 2020 20:27:53 -0500
Subject: [PATCH 06/21] ansible-galaxy -r /opt/iiab/iiab/collections.yml

---
 scripts/ansible | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ansible b/scripts/ansible
index 81facc937..d6a8ad263 100755
--- a/scripts/ansible
+++ b/scripts/ansible
@@ -95,7 +95,7 @@ $APT_PATH/apt -y --allow-downgrades install ansible-base \
 # upgrade of collection and dependencies it pulls in.  Note Ansible may support
 # upgrading all collections cleanly in future.  See PR #2652 (links) & PR #2653
 echo -e "\n\nIIAB requires these 3 Ansible Collections: (we upgrade them here if possible!)\n"
-ansible-galaxy collection install --force-with-deps -r collections.yml -p /usr/share/ansible/collections
+ansible-galaxy collection install --force-with-deps -r /opt/iiab/iiab/collections.yml -p /usr/share/ansible/collections
 # 2020-11-28: The ~3 Ansible Collections (~37MB) used by IIAB used to be here:
 #    /root/.ansible/collections/ansible_collections
 # But going forward they'll be stored here:

From f4b0adc1d6462a3af68178eb9d80f57bc767c424 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Sat, 28 Nov 2020 20:41:18 -0500
Subject: [PATCH 07/21] Identify OS from /etc/os-release to avoid stumbling on
 Mint directory /etc/upstream-release (same as scripts/local_facts.fact)

---
 iiab-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iiab-install b/iiab-install
index 261893cf3..f4d45d05c 100755
--- a/iiab-install
+++ b/iiab-install
@@ -8,7 +8,7 @@ INVENTORY=ansible_hosts
 IIAB_STATE_FILE=/etc/iiab/iiab_state.yml
 ARGS=""
 CWD=`pwd`
-OS=`grep ^ID= /etc/*release|cut -d= -f2`
+OS=`grep ^ID= /etc/os-release | cut -d= -f2`
 OS=${OS//\"/}
 MIN_RPI_KERN=4.19.97       # If using Raspbian, 'rpi-update' should no longer be nec -- please use Raspbian 2020-02-13 or higher: https://github.com/iiab/iiab/issues/1993
 MIN_ANSIBLE_VER=2.8.11     # Ansible 2.8.3 and 2.8.6 have serious bugs, preventing their use with IIAB.

From 5314234167def1093b592fa0a1cafe222742e724 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Sat, 28 Nov 2020 20:55:20 -0500
Subject: [PATCH 08/21] scripts/ansible: Mention PRs #2647 #2652 #2653 #2655

---
 scripts/ansible | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/ansible b/scripts/ansible
index d6a8ad263..64fb9cc0f 100755
--- a/scripts/ansible
+++ b/scripts/ansible
@@ -93,12 +93,12 @@ $APT_PATH/apt -y --allow-downgrades install ansible-base \
 
 # (Re)running collection installs appears safe, with --force-with-deps to force
 # upgrade of collection and dependencies it pulls in.  Note Ansible may support
-# upgrading all collections cleanly in future.  See PR #2652 (links) & PR #2653
-echo -e "\n\nIIAB requires these 3 Ansible Collections: (we upgrade them here if possible!)\n"
+# upgrading all collections cleanly in future.  See PRs #2647 #2652 #2653 #2655
+echo -e "\n\nIIAB requires these ~3 Ansible Collections: (we upgrade them here if possible!)\n"
 ansible-galaxy collection install --force-with-deps -r /opt/iiab/iiab/collections.yml -p /usr/share/ansible/collections
-# 2020-11-28: The ~3 Ansible Collections (~37MB) used by IIAB used to be here:
+# 2020-11-28: The ~3 Ansible Collections used by IIAB (~37MB) once lived here:
 #    /root/.ansible/collections/ansible_collections
-# But going forward they'll be stored here:
+# But going forward they'll be stored herein:
 #    /usr/share/ansible/collections/ansible_collections
 
 echo -e "\n\nCreating/verifying directory /etc/ansible & installing /etc/ansible/hosts\n"

From a3fc75d9ef8675522f7b84bc114af7d82d0871fc Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Sat, 28 Nov 2020 21:18:58 -0500
Subject: [PATCH 09/21] scripts/ansible: code readability

---
 scripts/ansible | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/ansible b/scripts/ansible
index 64fb9cc0f..0bc127605 100755
--- a/scripts/ansible
+++ b/scripts/ansible
@@ -15,8 +15,8 @@ GOOD_VER="2.10.3"    # Orig for 'yum install [rpm]' & XO laptops (pip install)
 # IIAB implementers might instead consider these 2 GENERAL TECHNIQUES below
 # ("in an emergency!") e.g. if you must install an older version of Ansible:
 
-# TEMPORARILY USE ANSIBLE 2.9.13 (REMOVE IT WITH "pip uninstall ansible")
-#pip install ansible==2.9.13
+# TEMPORARILY USE ANSIBLE 2.9.15 (REMOVE IT WITH "pip uninstall ansible")
+#pip install ansible==2.9.15
 
 # TEMPORARILY USE ANSIBLE 2.4.2 DUE TO 2.4.3 MEMORY BUG. Details: iiab/iiab#669
 #echo "Install http://download.iiab.io/packages/ansible_2.4.2.0-1ppa~xenial_all.deb"
@@ -95,7 +95,9 @@ $APT_PATH/apt -y --allow-downgrades install ansible-base \
 # upgrade of collection and dependencies it pulls in.  Note Ansible may support
 # upgrading all collections cleanly in future.  See PRs #2647 #2652 #2653 #2655
 echo -e "\n\nIIAB requires these ~3 Ansible Collections: (we upgrade them here if possible!)\n"
-ansible-galaxy collection install --force-with-deps -r /opt/iiab/iiab/collections.yml -p /usr/share/ansible/collections
+ansible-galaxy collection install --force-with-deps \
+               -r /opt/iiab/iiab/collections.yml \
+               -p /usr/share/ansible/collections
 # 2020-11-28: The ~3 Ansible Collections used by IIAB (~37MB) once lived here:
 #    /root/.ansible/collections/ansible_collections
 # But going forward they'll be stored herein:

From 43e5672bc0e32f81021bf8f88e3ae0f2eadcdcd7 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Sat, 28 Nov 2020 22:38:41 -0500
Subject: [PATCH 10/21] 1-prep/tasks/main.yml: Mention PR #2654 (AppArmor works
 w/ IIAB on Debian 10/11, so also now on Ubuntu?)

---
 roles/1-prep/tasks/main.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/roles/1-prep/tasks/main.yml b/roles/1-prep/tasks/main.yml
index 9953016bd..d24b49764 100644
--- a/roles/1-prep/tasks/main.yml
+++ b/roles/1-prep/tasks/main.yml
@@ -90,6 +90,7 @@
 # Curiously this has NOT stopped IIAB 7.0/master from working on Debian 10
 # pre-releases, during @floydianslips' March 2019 testing anyway!  SEE #1387
 
+# PR #2654 - AppArmor works w/ IIAB on Debian 10/11, so also now on Ubuntu?
 #- name: Disable AppArmor -- override OS default (ubuntu)
 #  systemd:
 #    name: apparmor

From 652da0fbbd47d22c671127e498c8e1d3951d6e0f Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Sat, 28 Nov 2020 23:18:35 -0500
Subject: [PATCH 11/21] 1-prep/tasks/main.yml: final code/comment cleanup for
 PR #2654 merge

---
 roles/1-prep/tasks/main.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/roles/1-prep/tasks/main.yml b/roles/1-prep/tasks/main.yml
index d24b49764..273aedc94 100644
--- a/roles/1-prep/tasks/main.yml
+++ b/roles/1-prep/tasks/main.yml
@@ -99,6 +99,7 @@
 #  when: is_ubuntu
 #  ignore_errors: True
 
+# PR #2648 - Can be restored in future if truly nec, w ansible.posix collection
 #- name: Disable SELinux on next boot (OS's other than debuntu)
 #  selinux:
 #    state: disabled
@@ -112,6 +113,7 @@
 
 ##  DISCOVER PLATFORMS ######
 # Put conditional actions for hardware platforms here
+
 - include_tasks: raspberry_pi.yml
   when: first_run and rpi_model != "none"
 
@@ -128,7 +130,7 @@
   when: internet_available and usb_NUC6.stdout|int > 0
 
 
-# this script can be sourced to get IIAB location
+# This script can be sourced to get IIAB path/location
 - name: Recording STAGE 1 HAS COMPLETED ============================
   template:
     src: roles/1-prep/templates/iiab.env.j2

From 11eeda5b4c3566e11709d3b52c9f2e05fd5344bb Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Wed, 2 Dec 2020 02:09:24 -0500
Subject: [PATCH 12/21] Gitea 1.12.6 -> 1.13.0

---
 roles/gitea/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/gitea/defaults/main.yml b/roles/gitea/defaults/main.yml
index 8d1d9a9ac..126020cc2 100644
--- a/roles/gitea/defaults/main.yml
+++ b/roles/gitea/defaults/main.yml
@@ -9,7 +9,7 @@
 
 # Info needed to install Gitea:
 
-gitea_version: 1.12.6
+gitea_version: 1.13.0
 iset_suffixes:
   i386: 386
   x86_64: amd64

From 0ae0a9db5ee023a66911ed0aee955aaded3bc158 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Thu, 3 Dec 2020 18:23:18 -0500
Subject: [PATCH 13/21] Moodle 3.9 -> 3.10

---
 roles/moodle/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/moodle/defaults/main.yml b/roles/moodle/defaults/main.yml
index d3163b3d5..2bb7fe704 100644
--- a/roles/moodle/defaults/main.yml
+++ b/roles/moodle/defaults/main.yml
@@ -7,7 +7,7 @@
 # All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml
 # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
 
-moodle_version: 39
+moodle_version: 310
 moodle_repo_url: https://github.com/moodle/moodle.git
 #moodle_repo_url: git://git.moodle.org/moodle.git    # 2020-10-16: VERY Slow!
 moodle_base: "{{ iiab_base }}/moodle"    # /opt/iiab

From 5f1244e2f2671d4f4eb5b943c407f700546d6e17 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Thu, 3 Dec 2020 20:49:22 -0500
Subject: [PATCH 14/21] Moodle 3.10 requires pkg: php{{ php_version }}-intl

---
 roles/moodle/tasks/install.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/roles/moodle/tasks/install.yml b/roles/moodle/tasks/install.yml
index f28594d10..558519af2 100644
--- a/roles/moodle/tasks/install.yml
+++ b/roles/moodle/tasks/install.yml
@@ -26,7 +26,7 @@
 #     state: present
 #   when: not is_debuntu
 
-- name: Install 4 php packages (debuntu)
+- name: Install 7 php packages (debuntu)
   package:
     name:
       - php{{ php_version }}-pgsql
@@ -34,7 +34,8 @@
       - php{{ php_version }}-zip
       - php{{ php_version }}-gd
       - php{{ php_version }}-mbstring    # 2020-06-15: Now required by Moodle 3.9+
-      - php{{ php_version }}-cli    # 2020-06-15: In the past this included (above) mbstring? However this is not true on Ubuntu Server 20.04 LTS.
+      - php{{ php_version }}-cli     # 2020-06-15: In the past this included (above) mbstring? However this is not true on Ubuntu Server 20.04 LTS.
+      - php{{ php_version }}-intl    # 2020-12-03: Now required by Moodle 3.10+
     state: present
   when: is_debuntu
 

From 7f89cb8fd41a108c84ed590c53f2f63e29646cab Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Thu, 3 Dec 2020 20:57:00 -0500
Subject: [PATCH 15/21] Moodle 3.10 recommends pkg php{{ php_version }}-soap

---
 roles/moodle/tasks/install.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/roles/moodle/tasks/install.yml b/roles/moodle/tasks/install.yml
index 558519af2..2f9495179 100644
--- a/roles/moodle/tasks/install.yml
+++ b/roles/moodle/tasks/install.yml
@@ -26,16 +26,17 @@
 #     state: present
 #   when: not is_debuntu
 
-- name: Install 7 php packages (debuntu)
+- name: Install 8 php packages (debuntu)
   package:
     name:
       - php{{ php_version }}-pgsql
       - php{{ php_version }}-curl
       - php{{ php_version }}-zip
       - php{{ php_version }}-gd
-      - php{{ php_version }}-mbstring    # 2020-06-15: Now required by Moodle 3.9+
+      - php{{ php_version }}-mbstring    # 2020-06-15: Required by Moodle 3.9+
       - php{{ php_version }}-cli     # 2020-06-15: In the past this included (above) mbstring? However this is not true on Ubuntu Server 20.04 LTS.
-      - php{{ php_version }}-intl    # 2020-12-03: Now required by Moodle 3.10+
+      - php{{ php_version }}-intl    # 2020-12-03: Required by Moodle 3.10+
+      - php{{ php_version }}-soap    # 2020-12-03: Recommended by Moodle 3.10+
     state: present
   when: is_debuntu
 

From 321075350f544d9323551969113e16ca1bbcc0f6 Mon Sep 17 00:00:00 2001
From: root <holta@users.noreply.github.com>
Date: Wed, 9 Dec 2020 12:17:51 -0500
Subject: [PATCH 16/21] iiab-diagnostics: handle filenames that contain spaces

---
 scripts/iiab-diagnostics | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/scripts/iiab-diagnostics b/scripts/iiab-diagnostics
index 2354ae9c0..73fa869ee 100755
--- a/scripts/iiab-diagnostics
+++ b/scripts/iiab-diagnostics
@@ -31,28 +31,28 @@ outfile=/etc/iiab/diag/${IIAB_RELEASE}_${OS_VER}_${YMDT}_$nickname
 # roles/0-init/tasks/main.yml.  A bit like system logs, but only on request.
 
 function cat_file_raw() {    # $1 = path/filename; $2 = # of lines, for tail
-    if [ -f $1 ]; then
-        ls -l $1 >> $outfile
-        if [ ! -s $1 ]; then
+    if [ -f "$1" ]; then
+        ls -l "$1" >> $outfile
+        if [ ! -s "$1" ]; then
             echo >> $outfile
             echo "FILE EXISTS BUT IS EMPTY!" >> $outfile
         elif [ $# -eq 1 ]; then
             echo >> $outfile
             # Redact most passwords from /etc/iiab/local_vars.yml, /etc/hostapd/hostapd.conf, /etc/wpa_supplicant/wpa_supplicant.conf, /etc/netplan/*, /etc/network/interfaces, /etc/network/interfaces.d/* ETC -- not much to worry about in /etc/iiab/iiab.ini (' = ')
-            cat $1 | sed 's/^\(\s*[[:alnum:]_-]*\(psk\|passphrase\|password\):\).*/\1 [REDACTED]/; s/^\(\s*[[:alnum:]_-]*\(psk\|passphrase\|password\)[= \t]\).*/\1[REDACTED]/' | iconv -t UTF-8//IGNORE >> $outfile
+            cat "$1" | sed 's/^\(\s*[[:alnum:]_-]*\(psk\|passphrase\|password\):\).*/\1 [REDACTED]/; s/^\(\s*[[:alnum:]_-]*\(psk\|passphrase\|password\)[= \t]\).*/\1[REDACTED]/' | iconv -t UTF-8//IGNORE >> $outfile
         else    # e.g. last 100 lines, maximum
             echo "                        ...ITS LAST $2 LINES FOLLOW..." >> $outfile
             echo >> $outfile
-	    tail -$2 $1 | sed 's/^\(\s*[[:alnum:]_-]*\(psk\|passphrase\|password\):\).*/\1 [REDACTED]/; s/^\(\s*[[:alnum:]_-]*\(psk\|passphrase\|password\)[= \t]\).*/\1[REDACTED]/' | iconv -t UTF-8//IGNORE >> $outfile
+	    tail -$2 "$1" | sed 's/^\(\s*[[:alnum:]_-]*\(psk\|passphrase\|password\):\).*/\1 [REDACTED]/; s/^\(\s*[[:alnum:]_-]*\(psk\|passphrase\|password\)[= \t]\).*/\1[REDACTED]/' | iconv -t UTF-8//IGNORE >> $outfile
         fi
         echo >> $outfile
-    elif [ -h $1 ]; then
-        ls -l $1 >> $outfile
+    elif [ -h "$1" ]; then
+        ls -l "$1" >> $outfile
         echo >> $outfile
         echo "SYMLINK DOES NOT LEAD TO A REGULAR FILE!" >> $outfile
         echo >> $outfile
-    elif [ -d $1 ]; then
-        ls -ld $1 >> $outfile
+    elif [ -d "$1" ]; then
+        ls -ld "$1" >> $outfile
         echo >> $outfile
         echo "THIS IS A DIRECTORY NOT A FILE!" >> $outfile
         echo >> $outfile
@@ -64,7 +64,7 @@ function cat_file_raw() {    # $1 = path/filename; $2 = # of lines, for tail
 function cat_file() {
     echo "     $1"
     echo "=IIAB==========================================================================" >> $outfile
-    cat_file_raw $1
+    cat_file_raw "$1"
 }
 
 function cat_dir() {
@@ -72,9 +72,10 @@ function cat_dir() {
     echo "=IIAB==========================================================================" >> $outfile
     if [ -d "$1" ]; then
         echo "DIRECTORY $1 FILES WILL FOLLOW...IF THEY EXIST" >> $outfile
-        for f in $(ls $1); do
+	shopt -s nullglob    # To avoid looping over empty directories
+        for f in "$1"/*; do
             echo "-IIAB--------------------------------------------------------------------------" >> $outfile
-            cat_file_raw $1/$f 100
+            cat_file_raw "$f" 100
         done
     else
         echo "DIRECTORY DOES NOT EXIST: $1" >> $outfile
@@ -84,7 +85,7 @@ function cat_dir() {
 function cat_cmd() {                        # $1 = command + params, $2 = explanation
     echo "     $1  # $2"
     echo "=IIAB==========================================================================" >> $outfile
-    cmd=$(echo $1 | sed 's/\s.*$//')        # Keep command on left; Drop params on right
+    cmd=$(echo "$1" | sed 's/\s.*$//')        # Keep command on left; Drop params on right
     pth=$(which $cmd | sed 's/[^/]*$//')    # Keep only path on left; Drop command on right
     echo "COMMAND: $pth$1    # $2" >> $outfile
     echo >> $outfile
@@ -99,7 +100,7 @@ function cat_cmd() {                        # $1 = command + params, $2 = explan
 function cat_tail() {     # $1 = path/filename; $2 = # of lines, for tail
     echo "     $1"
     echo "=IIAB==========================================================================" >> $outfile
-    cat_file_raw $1 $2    # e.g. last 100 lines, maximum
+    cat_file_raw "$1" $2    # e.g. last 100 lines, maximum
 }
 
 # START BUILDING UP THE FILE THAT'LL CONTAIN THE DIAGNOSTICS!

From 112a68802caef55998b3f6791d66c0fb5cb81caf Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Wed, 9 Dec 2020 12:32:20 -0500
Subject: [PATCH 17/21] iiab-dagnostics: untabify indentation

---
 scripts/iiab-diagnostics | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/iiab-diagnostics b/scripts/iiab-diagnostics
index 73fa869ee..edbc78985 100755
--- a/scripts/iiab-diagnostics
+++ b/scripts/iiab-diagnostics
@@ -72,7 +72,7 @@ function cat_dir() {
     echo "=IIAB==========================================================================" >> $outfile
     if [ -d "$1" ]; then
         echo "DIRECTORY $1 FILES WILL FOLLOW...IF THEY EXIST" >> $outfile
-	shopt -s nullglob    # To avoid looping over empty directories
+        shopt -s nullglob    # To avoid looping over empty directories
         for f in "$1"/*; do
             echo "-IIAB--------------------------------------------------------------------------" >> $outfile
             cat_file_raw "$f" 100

From dd831aa946233dcfc63c5e5214f235610e8145ca Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Wed, 9 Dec 2020 12:35:26 -0500
Subject: [PATCH 18/21] iiab-dagnostics: untabify indentation

---
 scripts/iiab-diagnostics | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/iiab-diagnostics b/scripts/iiab-diagnostics
index edbc78985..b64423262 100755
--- a/scripts/iiab-diagnostics
+++ b/scripts/iiab-diagnostics
@@ -43,7 +43,7 @@ function cat_file_raw() {    # $1 = path/filename; $2 = # of lines, for tail
         else    # e.g. last 100 lines, maximum
             echo "                        ...ITS LAST $2 LINES FOLLOW..." >> $outfile
             echo >> $outfile
-	    tail -$2 "$1" | sed 's/^\(\s*[[:alnum:]_-]*\(psk\|passphrase\|password\):\).*/\1 [REDACTED]/; s/^\(\s*[[:alnum:]_-]*\(psk\|passphrase\|password\)[= \t]\).*/\1[REDACTED]/' | iconv -t UTF-8//IGNORE >> $outfile
+            tail -$2 "$1" | sed 's/^\(\s*[[:alnum:]_-]*\(psk\|passphrase\|password\):\).*/\1 [REDACTED]/; s/^\(\s*[[:alnum:]_-]*\(psk\|passphrase\|password\)[= \t]\).*/\1[REDACTED]/' | iconv -t UTF-8//IGNORE >> $outfile
         fi
         echo >> $outfile
     elif [ -h "$1" ]; then

From 45dbfaaa2bf5a5cb3068f813263dfae8ededf971 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Wed, 9 Dec 2020 22:06:19 -0500
Subject: [PATCH 19/21] Update iiab-diagnostics.README.md

---
 scripts/iiab-diagnostics.README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/iiab-diagnostics.README.md b/scripts/iiab-diagnostics.README.md
index 3bf5cfdb2..00ae4ddc7 100644
--- a/scripts/iiab-diagnostics.README.md
+++ b/scripts/iiab-diagnostics.README.md
@@ -62,4 +62,4 @@ But first off, the file is compiled by harvesting 1 + 6 kinds of things:
 
 ## Source Code
 
-Please look over the bottom of [iiab-diagnostics](iiab-diagnostics) (lines 105-221 especially) to learn more about which common IIAB files and commands make this rapid troubleshooting possible.
+Please look over the bottom of [iiab-diagnostics](iiab-diagnostics) (lines 106-222 especially) to learn more about which common IIAB files and commands make this rapid troubleshooting possible.

From e18a89975e6e0da07f951ab36a5fe856d01c4a6d Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Tue, 15 Dec 2020 05:59:45 -0500
Subject: [PATCH 20/21] Recommend Ansible (ansible-base) 2.10.4

---
 scripts/ansible | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ansible b/scripts/ansible
index bfd02e073..3bdc9ab9a 100755
--- a/scripts/ansible
+++ b/scripts/ansible
@@ -5,7 +5,7 @@
 
 APT_PATH=/usr/bin    # Avoids problematic /usr/local/bin/apt on Linux Mint
 CURR_VER="undefined"    # Ansible version you currently have installed
-GOOD_VER="2.10.3"    # Orig for 'yum install [rpm]' & XO laptops (pip install)
+GOOD_VER="2.10.4"    # Orig for 'yum install [rpm]' & XO laptops (pip install)
 # We install latest 'ansible-base' from PPA: (may be more recent than GOOD-VER)
 # https://launchpad.net/~ansible/+archive/ubuntu/ansible
 # https://launchpad.net/~ansible/+archive/ubuntu/ansible-2.10

From 6ecad1da0538351bdfa78780b2e9e39cfb5a2956 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Tue, 15 Dec 2020 06:25:41 -0500
Subject: [PATCH 21/21] Mentions Ansible 2.9.16 as possible alternative

---
 scripts/ansible | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/ansible b/scripts/ansible
index 86eea0c4d..33d725383 100755
--- a/scripts/ansible
+++ b/scripts/ansible
@@ -15,8 +15,8 @@ GOOD_VER="2.10.4"    # Orig for 'yum install [rpm]' & XO laptops (pip install)
 # IIAB implementers might instead consider these 2 GENERAL TECHNIQUES below
 # ("in an emergency!") e.g. if you must install an older version of Ansible:
 
-# TEMPORARILY USE ANSIBLE 2.9.15 (REMOVE IT WITH "pip uninstall ansible")
-#pip install ansible==2.9.15
+# TEMPORARILY USE ANSIBLE 2.9.16 (REMOVE IT WITH "pip uninstall ansible")
+#pip install ansible==2.9.16
 
 # TEMPORARILY USE ANSIBLE 2.4.2 DUE TO 2.4.3 MEMORY BUG. Details: iiab/iiab#669
 #echo "Install http://download.iiab.io/packages/ansible_2.4.2.0-1ppa~xenial_all.deb"