From 5092229fcce01f80932e928afd7f146ec1ccc849 Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Mon, 26 Apr 2021 16:44:09 -0500
Subject: [PATCH 01/18] replace 'brctl' with 'bridge'

---
 iiab-network                      | 4 ++--
 roles/2-common/tasks/packages.yml | 2 +-
 roles/network/tasks/restart.yml   | 2 +-
 scripts/iiab-diagnostics          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/iiab-network b/iiab-network
index 30c16b4f9..6ff4b5cd3 100755
--- a/iiab-network
+++ b/iiab-network
@@ -73,7 +73,7 @@ if [[ `command -v nmcli` ]]; then        # "command -v" is POSIX compliant; it c
 fi
 
 ip r >> iiab-network.log
-brctl show >> iiab-network.log
+bridge -d link >> iiab-network.log
 echo >> iiab-network.log
 echo "iiab-network run start: $Start" >> iiab-network.log
 echo "iiab-network run end: $End" >> iiab-network.log
@@ -88,7 +88,7 @@ if [[ `command -v nmcli` ]]; then
     nmcli c
 fi
 ip r
-brctl show
+bridge -d link
 echo
 echo "iiab-network run start: $Start"
 echo "iiab-network run end: $End"
diff --git a/roles/2-common/tasks/packages.yml b/roles/2-common/tasks/packages.yml
index 83f3db415..c07a7048f 100644
--- a/roles/2-common/tasks/packages.yml
+++ b/roles/2-common/tasks/packages.yml
@@ -31,7 +31,6 @@
   package:
     name:
       - acpid
-      - bridge-utils
       - bzip2
       - curl
       #- etckeeper    # "nobody is really using etckeeper and it's bloating the filesystem every time apt runs" per @jvonau at https://github.com/iiab/iiab/issues/1146
@@ -39,6 +38,7 @@
       - hostapd
       - htop
       - i2c-tools
+      - iproute2
       - logrotate
       #- lynx    # Installed by 1-prep's roles/iiab-admin/tasks/access.yml
       - make
diff --git a/roles/network/tasks/restart.yml b/roles/network/tasks/restart.yml
index 3c1e1c793..d1573dd5e 100644
--- a/roles/network/tasks/restart.yml
+++ b/roles/network/tasks/restart.yml
@@ -65,7 +65,7 @@
   command: /usr/bin/iiab-gen-iptables
 
 - name: Checking if WiFi slave is active
-  shell: brctl show br0 | grep {{ iiab_wireless_lan_iface }} | wc -l
+  shell: bridge -d link | grep {{ iiab_wireless_lan_iface }} | wc -l
 #  when: hostapd_enabled and discovered_wireless_iface != iiab_wan_iface and iiab_lan_iface == "br0"
   when: hostapd_enabled and iiab_lan_iface == "br0"
   register: wifi_slave
diff --git a/scripts/iiab-diagnostics b/scripts/iiab-diagnostics
index 242fc8b60..35b4965b2 100755
--- a/scripts/iiab-diagnostics
+++ b/scripts/iiab-diagnostics
@@ -189,7 +189,7 @@ cat_cmd 'ip addr' 'Network interfaces'
 cat_cmd 'ifconfig' 'Network interfaces (old view)'
 cat_cmd 'ip route' 'Routing table'
 cat_cmd 'netstat -rn' 'Routing table (old view)'
-cat_cmd 'brctl show' 'Bridge for LAN side'
+cat_cmd 'bridge -d link' 'Bridge for LAN side'
 cat_cmd 'sudo netstat -natp' 'Ports/Services in use'
 cat_cmd 'systemctl status dnsmasq' 'Is dnsmasq running?'
 cat_cmd 'sudo journalctl -b 0 -u dnsmasq' 'dnsmasq log'

From 8437dbebcba3143b64a9146bf0e990c52c5e5208 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Tue, 27 Apr 2021 16:19:40 -0400
Subject: [PATCH 02/18] Sugarizer 1.4.0 -> 1.5.0

---
 roles/sugarizer/defaults/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/sugarizer/defaults/main.yml b/roles/sugarizer/defaults/main.yml
index 9c9573037..cdf6dc8fb 100644
--- a/roles/sugarizer/defaults/main.yml
+++ b/roles/sugarizer/defaults/main.yml
@@ -9,8 +9,8 @@
 # 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!
 
-sugarizer_dir_version: sugarizer-1.4.0    # WAS: sugarizer-1.0, sugarizer-master, sugarizer-1.1.0, sugarizer-1.2.0, sugarizer-1.3.0
-sugarizer_git_version: v1.4.0             # WAS: v1.0.1, master, v1.1.0, v1.2.0, v1.3.0
+sugarizer_dir_version: sugarizer-1.5.0    # WAS: sugarizer-1.0, sugarizer-master, sugarizer-1.1.0, sugarizer-1.2.0, sugarizer-1.3.0, sugarizer-1.4.0
+sugarizer_git_version: v1.5.0             # WAS: v1.0.1, master, v1.1.0, v1.2.0, v1.3.0, v1.4.0
 # PLEASE HELP MONITOR https://github.com/llaske/sugarizer/releases
 
 sugarizer_server_dir_version: sugarizer-server-1.3.0    # WAS: sugarizer-server-1.0, sugarizer-server-master, sugarizer-server-dev, sugarizer-server-1.1.0, sugarizer-server-1.1.1, sugarizer-server-1.2.0

From 1442e477e093ee31b8a79bca089f9c85bf7ef97e Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Tue, 27 Apr 2021 16:42:41 -0400
Subject: [PATCH 03/18] Clarify that /opt/iiab/sugarizer-1.5.0 is ~717MB

---
 roles/sugarizer/tasks/install.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/sugarizer/tasks/install.yml b/roles/sugarizer/tasks/install.yml
index b986ca304..e1cafdb4b 100644
--- a/roles/sugarizer/tasks/install.yml
+++ b/roles/sugarizer/tasks/install.yml
@@ -29,7 +29,7 @@
 
 # 2. DOWNLOAD+LINK /opt/iiab/sugarizer
 
-- name: Clone llaske/sugarizer ({{ sugarizer_git_version }} branch/version) from GitHub to /opt/iiab/{{ sugarizer_dir_version }} (DOWNLOADS ~710 MB)
+- name: Clone llaske/sugarizer ({{ sugarizer_git_version }} branch/version) from GitHub to /opt/iiab/{{ sugarizer_dir_version }} (DOWNLOADS ~717 MB)
   git:
     repo: https://github.com/llaske/sugarizer
     dest: "{{ iiab_base }}/{{ sugarizer_dir_version }}"

From 6bbb95cd9ef0ff4af284416fcbab53aa0c4c3e41 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Wed, 28 Apr 2021 00:47:10 -0400
Subject: [PATCH 04/18] lokole/tasks/main.yml: fix illegal char EM DASH \u2014
 in iiab.ini description

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

diff --git a/roles/lokole/tasks/main.yml b/roles/lokole/tasks/main.yml
index aaccc44e5..34258dd52 100644
--- a/roles/lokole/tasks/main.yml
+++ b/roles/lokole/tasks/main.yml
@@ -73,7 +73,7 @@
     - option: name
       value: Lokole
     - option: description
-      value: '"Lokole is an email service that works offline, for rural communities.  With a 3G/4G modem, you can arrange to batch-upload / batch-download emails once per night — for almost no cost at all — depending on mobile data plans in your country."'
+      value: '"Lokole is an email service that works offline, for rural communities.  With a 3G/4G modem, you can arrange to batch-upload / batch-download emails once per night -- for almost no cost at all -- depending on mobile data plans in your country."'
       #value: '"Lokole is an email service that works offline, for rural communities.  In some cases, emails can also be transmitted to/from the Internet, taking advantage of discounted mobile data rates."'
     - option: lokole_run_directory
       value: "{{ lokole_run_directory }}"

From c94b76d063a18ddd71381a60b4b006cda9100ebc Mon Sep 17 00:00:00 2001
From: Blondel MONDESIR <16546989+deldesir@users.noreply.github.com>
Date: Wed, 28 Apr 2021 11:28:33 -0400
Subject: [PATCH 05/18] Rename br0.j2 to br0.j2.deprecated

---
 roles/network/templates/network/{br0.j2 => br0.j2.deprecated} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename roles/network/templates/network/{br0.j2 => br0.j2.deprecated} (100%)

diff --git a/roles/network/templates/network/br0.j2 b/roles/network/templates/network/br0.j2.deprecated
similarity index 100%
rename from roles/network/templates/network/br0.j2
rename to roles/network/templates/network/br0.j2.deprecated

From 387b0e5875c6f24dc49388b52b39be4662f74fe9 Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Wed, 28 Apr 2021 11:08:38 -0500
Subject: [PATCH 06/18] long term fix

---
 roles/usb_lib/tasks/install.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/roles/usb_lib/tasks/install.yml b/roles/usb_lib/tasks/install.yml
index 25b671f06..3304a0f16 100644
--- a/roles/usb_lib/tasks/install.yml
+++ b/roles/usb_lib/tasks/install.yml
@@ -76,6 +76,11 @@
     line: 'FILESYSTEMS="vfat ext2 ext3 ext4 hfsplus exfat fuseblk ntfs"'
     path: /etc/usbmount/usbmount.conf
 
+- name: Remove /etc/usbmount/mount.d/00_create_model_symlink
+  file:
+    path: /etc/usbmount/mount.d/00_create_model_symlink
+    state: absent
+
 # 2021-03-25: Consider removing this stanza & all of this role's Apache logic!
 - name: Install /etc/{{ apache_conf_dir }}/content_dir.conf from template
   template:

From be1b98cd8cc30b13ff715b986b9e69d2944a323b Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Wed, 28 Apr 2021 11:08:52 -0500
Subject: [PATCH 07/18] short term fix

---
 roles/usb_lib/tasks/main.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/roles/usb_lib/tasks/main.yml b/roles/usb_lib/tasks/main.yml
index da1bd6c12..2f2a23b8e 100644
--- a/roles/usb_lib/tasks/main.yml
+++ b/roles/usb_lib/tasks/main.yml
@@ -64,6 +64,11 @@
   include_tasks: nginx.yml
   when: nginx_enabled
 
+# clean up here to catch the already installed users, remove for the next release
+- name: Remove /etc/usbmount/mount.d/00_create_model_symlink
+  file:
+    path: /etc/usbmount/mount.d/00_create_model_symlink
+    state: absent
 
 - name: Put variable in iiab.env that enables display of content at root of USB
   lineinfile:

From a581d6ebf4dec6b41a3b61fa578507c9ff33db8b Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Sun, 6 Dec 2020 22:06:18 -0600
Subject: [PATCH 08/18] use the same logic as netplan.yml for br0

---
 roles/network/tasks/NM-debian.yml        |  9 +++++++++
 roles/network/tasks/netplan.yml          | 22 ++++++++++++----------
 roles/network/tasks/sysd-netd-debian.yml | 11 ++++++++++-
 3 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/roles/network/tasks/NM-debian.yml b/roles/network/tasks/NM-debian.yml
index ece7fa8cd..64ee8cb25 100644
--- a/roles/network/tasks/NM-debian.yml
+++ b/roles/network/tasks/NM-debian.yml
@@ -70,6 +70,15 @@
     mode: 0600
   when: wan_ip != "dhcp"
 
+- name: Set systemd_networkd enabled
+  set_fact:
+    systemd_networkd_active: True
+  when: iiab_lan_iface == "br0"
+
+- name: Use systemd-networkd to handle br0
+  include_tasks: sysd-netd-debian.yml
+  when: iiab_lan_iface == "br0"
+
 - name: Reload systemd
   systemd:
     daemon_reload: yes
diff --git a/roles/network/tasks/netplan.yml b/roles/network/tasks/netplan.yml
index b103f3331..afa33c3ce 100644
--- a/roles/network/tasks/netplan.yml
+++ b/roles/network/tasks/netplan.yml
@@ -23,17 +23,19 @@
     - systemd-networkd-wait-online
   when: systemd_networkd_active
 
-- name: Unmask and enable the systemd-networkd service for br0
-  systemd:
-    name: systemd-networkd
-    enabled: yes
-    masked: no
-  when: network_manager_active and iiab_lan_iface == "br0"
+# Moved to NM-debian.yml 2020-12-07
+#- name: Unmask and enable the systemd-networkd service for br0
+#  systemd:
+#    name: systemd-networkd
+#    enabled: yes
+#    masked: no
+#  when: network_manager_active and iiab_lan_iface == "br0"
 
-- name: Ensure systemd-networkd gets enabled for br0
-  set_fact:
-    systemd_networkd_active: True
-  when: network_manager_active and iiab_lan_iface == "br0"
+# Moved to NM-debian.yml 2020-12-07
+#- name: Ensure systemd-networkd gets enabled for br0
+#  set_fact:
+#    systemd_networkd_active: True
+#  when: network_manager_active and iiab_lan_iface == "br0"
 
 # ICO will always set gui_static_wan_ip away from the default of 'unset' while
 # gui_static_wan turns dhcp on/off through wan_ip in computed_network and
diff --git a/roles/network/tasks/sysd-netd-debian.yml b/roles/network/tasks/sysd-netd-debian.yml
index c334d6688..622663462 100644
--- a/roles/network/tasks/sysd-netd-debian.yml
+++ b/roles/network/tasks/sysd-netd-debian.yml
@@ -57,10 +57,19 @@
     state: started
   when: wifi_up_down and discovered_wireless_iface != "none"
 
-- name: Restart the systemd-networkd service
+- name: Enable & Restart systemd-networkd.service
   systemd:
     name: systemd-networkd
     state: restarted
+    enabled: yes
+    masked: no
+
+- name: Enable & Restart networkd-dispatcher.service
+  systemd:
+    name: networkd-dispatcher
+    state: restarted
+    enabled: yes
+    masked: no
 
 - name: Restart hostapd when WiFi is present but not when using WiFi as gateway with wifi_up_down False
   systemd:

From bdfd2b057a6eab06028f4924c1f4a6480f3d7048 Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Mon, 7 Dec 2020 09:54:00 -0600
Subject: [PATCH 09/18] save a daemon_reload

---
 roles/network/tasks/NM-debian.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/roles/network/tasks/NM-debian.yml b/roles/network/tasks/NM-debian.yml
index 64ee8cb25..8cf977c8a 100644
--- a/roles/network/tasks/NM-debian.yml
+++ b/roles/network/tasks/NM-debian.yml
@@ -70,18 +70,14 @@
     mode: 0600
   when: wan_ip != "dhcp"
 
-- name: Set systemd_networkd enabled
-  set_fact:
-    systemd_networkd_active: True
-  when: iiab_lan_iface == "br0"
-
 - name: Use systemd-networkd to handle br0
   include_tasks: sysd-netd-debian.yml
-  when: iiab_lan_iface == "br0"
+  when: iiab_lan_iface == "br0" and not systemd_networkd_active
 
 - name: Reload systemd
   systemd:
     daemon_reload: yes
+  when: not iiab_lan_iface == "br0"
 
 - name: Restart the NetworkManager service
   systemd:

From 8b665c787b3ed2fc37a17a97fb05e07c87522a89 Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Tue, 8 Dec 2020 04:20:42 -0600
Subject: [PATCH 10/18] ensure networkd-dispatcher is installed

---
 roles/2-common/tasks/iptables.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/roles/2-common/tasks/iptables.yml b/roles/2-common/tasks/iptables.yml
index 94c1ff003..b8f42b5ef 100644
--- a/roles/2-common/tasks/iptables.yml
+++ b/roles/2-common/tasks/iptables.yml
@@ -26,6 +26,12 @@
     path: /etc/systemd/system/iptables.service
     state: absent
 
+- name: Install package networkd-dispatcher (OS's other than RaspOS)
+  package:
+    name: networkd-dispatcher
+    state: present
+  when: not is_raspbian
+
 - name: Install package iptables-persistent (debuntu)
   package:
     name: iptables-persistent

From 9bc7ae986394e838e7e3580b3e7bfcdd4998d846 Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Thu, 25 Feb 2021 13:22:24 -0600
Subject: [PATCH 11/18] rename iptables.yml -> network.yml

---
 roles/2-common/tasks/main.yml                      | 2 +-
 roles/2-common/tasks/{iptables.yml => network.yml} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename roles/2-common/tasks/{iptables.yml => network.yml} (100%)

diff --git a/roles/2-common/tasks/main.yml b/roles/2-common/tasks/main.yml
index 66fedacd4..e55d12c05 100644
--- a/roles/2-common/tasks/main.yml
+++ b/roles/2-common/tasks/main.yml
@@ -19,7 +19,7 @@
   when: xo_model != "none" or osbuilder is defined
 
 - include_tasks: packages.yml
-- include_tasks: iptables.yml
+- include_tasks: network.yml
 
 # Ongoing rework (e.g. PR #2652) arising from ansible.posix collection changes:
 - name: Use 'sysctl' to set 5 network/kernel settings, turning off IPv6 if possible
diff --git a/roles/2-common/tasks/iptables.yml b/roles/2-common/tasks/network.yml
similarity index 100%
rename from roles/2-common/tasks/iptables.yml
rename to roles/2-common/tasks/network.yml

From 829fba343137c5241d7361c0e0e41865da2d0ff7 Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Tue, 27 Apr 2021 18:48:03 -0500
Subject: [PATCH 12/18] move network related packages

---
 roles/2-common/tasks/network.yml  | 7 ++++++-
 roles/2-common/tasks/packages.yml | 2 --
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/roles/2-common/tasks/network.yml b/roles/2-common/tasks/network.yml
index b8f42b5ef..3341efaed 100644
--- a/roles/2-common/tasks/network.yml
+++ b/roles/2-common/tasks/network.yml
@@ -32,9 +32,14 @@
     state: present
   when: not is_raspbian
 
+# used in the network role
 - name: Install package iptables-persistent (debuntu)
   package:
-    name: iptables-persistent
+    name:
+      - iproute2
+      - iptables-persistent
+      - hostapd
+      - netmask
     state: present
   when: is_debuntu
 
diff --git a/roles/2-common/tasks/packages.yml b/roles/2-common/tasks/packages.yml
index 4d38c665a..7bc0658cc 100644
--- a/roles/2-common/tasks/packages.yml
+++ b/roles/2-common/tasks/packages.yml
@@ -36,14 +36,12 @@
       - curl          # Used to install roles/nodejs and roles/nodered
       #- etckeeper    # "nobody is really using etckeeper and it's bloating the filesystem every time apt runs" per @jvonau at https://github.com/iiab/iiab/issues/1146
       - gawk
-      - hostapd
       - htop
       - i2c-tools     # Low-level bus/chip/register/EEPROM tools e.g. for RTC
       - logrotate
       #- lynx         # Installed by 1-prep's roles/iiab-admin/tasks/access.yml
       - make          # 2021-04-26: What roles (if any) truly still use this?
       - mlocate
-      - netmask
       - net-tools     # 2021-04-26: @jvonau suggests possibly deleting this...unless oldtimers really want these older commands in iiab-diagnostics output?
       - ntfs-3g       # Possibly no longer nec, similar to exfat packages above?
       #- openssh-server    # ssh (Raspbian) or openssh-server (other OS's) already installed by 1-prep's roles/sshd/tasks/main.yml

From fc61d044f19bb03de4612455d9718a125f8655be Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Tue, 27 Apr 2021 19:06:43 -0500
Subject: [PATCH 13/18] cull redhat routines

---
 roles/2-common/tasks/network.yml | 42 --------------------------------
 1 file changed, 42 deletions(-)

diff --git a/roles/2-common/tasks/network.yml b/roles/2-common/tasks/network.yml
index 3341efaed..fb9db1587 100644
--- a/roles/2-common/tasks/network.yml
+++ b/roles/2-common/tasks/network.yml
@@ -1,31 +1,3 @@
-- name: Disable firewalld service (OS's other than debuntu)
-  service:
-    name: firewalld
-    enabled: no
-  when: not is_debuntu
-
-# Likely no longer nec as of 2019
-- name: Use larger hammer -- systemctl disable firewalld -- 2 symbolic links involved (OS's other than debuntu)
-  shell: systemctl disable firewalld.service
-  when: not is_debuntu
-
-- name: Mask firewalld service (OS's other than debuntu)
-  shell: systemctl mask firewalld
-  ignore_errors: yes
-  when: not installing and not is_debuntu
-
-- name: Stop firewalld service (OS's other than debuntu)
-  service:
-    name: firewalld
-    state: stopped
-  ignore_errors: yes
-  when: not installing and not is_debuntu
-
-- name: Remove /etc/systemd/system/iptables.service
-  file:
-    path: /etc/systemd/system/iptables.service
-    state: absent
-
 - name: Install package networkd-dispatcher (OS's other than RaspOS)
   package:
     name: networkd-dispatcher
@@ -43,20 +15,6 @@
     state: present
   when: is_debuntu
 
-- name: Install package iptables-services (OS's other than debuntu)
-  package:
-    name: iptables-services
-    state: present
-  when: not is_debuntu
-
-- name: Install /etc/sysconfig/iptables-config from template
-  template:
-    src: iptables-config
-    dest: /etc/sysconfig/iptables-config
-    # owner: root
-    # group: root
-    # mode: '0644'
-
 - name: Install /etc/network/if-pre-up.d/iptables from template (debuntu)
   template:
     src: iptables

From 5914afd1d4a2e7186322275fc7ebd5131091e539 Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Wed, 28 Apr 2021 16:43:05 -0500
Subject: [PATCH 14/18] 20

---
 roles/2-common/tasks/packages.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/2-common/tasks/packages.yml b/roles/2-common/tasks/packages.yml
index 7bc0658cc..afbeb9d67 100644
--- a/roles/2-common/tasks/packages.yml
+++ b/roles/2-common/tasks/packages.yml
@@ -27,7 +27,7 @@
     state: present
   when: is_debuntu
 
-- name: "Install 22 common packages: acpid, bridge-utils, bzip2, curl, gawk, hostapd, htop, i2c-tools, logrotate, make, mlocate, netmask, net-tools, ntfs-3g, pandoc, pastebinit, rsync, sqlite3, tar, unzip, usbutils, wget"
+- name: "Install 20 common packages: acpid, bridge-utils, bzip2, curl, gawk, hostapd, htop, i2c-tools, logrotate, make, mlocate, netmask, net-tools, ntfs-3g, pandoc, pastebinit, rsync, sqlite3, tar, unzip, usbutils, wget"
   package:
     name:
       - acpid         # Daemon for ACPI (power mgmt) events

From e8af7465971ebc3f1af060776ed11a1a0dce4ca7 Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Wed, 28 Apr 2021 20:13:35 -0500
Subject: [PATCH 15/18] cups - drop apache

The port is open anyway, just lose the /cups redirect, not worth dragging apache in. Still
missing the nginx config to make apache work, nginx should really just use nginx directly.
---
 roles/cups/tasks/enable-or-disable.yml |  8 --------
 roles/cups/tasks/install.yml           | 16 ----------------
 2 files changed, 24 deletions(-)

diff --git a/roles/cups/tasks/enable-or-disable.yml b/roles/cups/tasks/enable-or-disable.yml
index 866536c97..74a9ee702 100644
--- a/roles/cups/tasks/enable-or-disable.yml
+++ b/roles/cups/tasks/enable-or-disable.yml
@@ -1,11 +1,3 @@
-- name: Enable http://box/cups via Apache (MIGHT NOT WORK?)
-  command: a2ensite cups.conf
-  when: cups_enabled
-
-- name: Disable http://box/cups via Apache
-  command: a2dissite cups.conf
-  when: not cups_enabled
-
 - name: systemd daemon-reload
   systemd:
     daemon_reload: yes
diff --git a/roles/cups/tasks/install.yml b/roles/cups/tasks/install.yml
index dd17420ba..15630862e 100644
--- a/roles/cups/tasks/install.yml
+++ b/roles/cups/tasks/install.yml
@@ -1,13 +1,3 @@
-- name: "Set 'apache_install: True' and 'apache_enabled: True'"
-  set_fact:
-    apache_install: True
-    apache_enabled: True
-
-- name: APACHE - run 'httpd' role
-  include_role:
-    name: httpd
-
-
 - name: Install 'cups' package
   package:
     name: cups
@@ -18,12 +8,6 @@
     src: cupsd.conf
     dest: /etc/cups/cupsd.conf
 
-- name: Install /etc/{{ apache_conf_dir }}/cups.conf from template
-  template:
-    src: cups.conf
-    dest: "/etc/{{ apache_conf_dir }}/"
-
-
 # RECORD CUPS AS INSTALLED
 
 - name: "Set 'cups_installed: True'"

From 0a2e44c2e7341ecaf3bb4ab2e25038c8e8b99704 Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Wed, 28 Apr 2021 20:42:48 -0500
Subject: [PATCH 16/18] update Readme

---
 roles/nginx/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/nginx/README.md b/roles/nginx/README.md
index 79f62cfcb..d3d462628 100644
--- a/roles/nginx/README.md
+++ b/roles/nginx/README.md
@@ -34,7 +34,6 @@
       * 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/3-base-server/tasks/main.yml#L11](../3-base-server/tasks/main.yml#L11) for a list of IIAB Apps/Services that auto-enable Apache.
-      * cups [*, shim not yet in place.]
       * elgg
       * lokole
       * moodle
@@ -43,6 +42,7 @@
    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)
       * bluetooth
       * calibre (menu goes directly to port 8080)
+      * cups [(available on port 631) * shim not yet in place.]
       * internetarchive (menu goes directly to port 4244, [PR #2120](https://github.com/iiab/iiab/pull/2120)) [*]
       * kalite (menu goes directly to ports 8006-8008)
       * minetest

From 8cae78bfbfc54bf1f10035b171a4ec44b2d69a22 Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Thu, 29 Apr 2021 01:10:35 -0500
Subject: [PATCH 17/18] touch up

---
 roles/2-common/tasks/network.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/2-common/tasks/network.yml b/roles/2-common/tasks/network.yml
index fb9db1587..3056e98fb 100644
--- a/roles/2-common/tasks/network.yml
+++ b/roles/2-common/tasks/network.yml
@@ -5,7 +5,7 @@
   when: not is_raspbian
 
 # used in the network role
-- name: Install package iptables-persistent (debuntu)
+- name: Install network related packages (debuntu)
   package:
     name:
       - iproute2

From 26dc468c3e857aed1605183fc52ab438f0eae8fd Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Thu, 29 Apr 2021 11:03:23 -0400
Subject: [PATCH 18/18] usb_lib/tasks/main.yml: clarifying comment (remove for
 next release)

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

diff --git a/roles/usb_lib/tasks/main.yml b/roles/usb_lib/tasks/main.yml
index 2f2a23b8e..02a1f7882 100644
--- a/roles/usb_lib/tasks/main.yml
+++ b/roles/usb_lib/tasks/main.yml
@@ -64,7 +64,7 @@
   include_tasks: nginx.yml
   when: nginx_enabled
 
-# clean up here to catch the already installed users, remove for the next release
+# 2021-04-29: Clean up here to catch the already installed users, remove for the next release (PR #2760)
 - name: Remove /etc/usbmount/mount.d/00_create_model_symlink
   file:
     path: /etc/usbmount/mount.d/00_create_model_symlink