From 7fb780aea23d621ca40f4b7c1e004bcecf93277e Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Sat, 15 Feb 2025 23:51:04 -0600
Subject: [PATCH] bring back umount.d/70-usb-library.j2

---
 .../{iiab-clean-usb.sh => iiab-clean-usb.sh.unused} |  0
 roles/usb_lib/tasks/install.yml                     |  1 -
 roles/usb_lib/tasks/nginx.yml                       |  8 ++++++++
 .../70-usb-library => umount.d/70-usb-library.j2}   | 13 +++++--------
 4 files changed, 13 insertions(+), 9 deletions(-)
 rename roles/usb_lib/files/usbmount/{iiab-clean-usb.sh => iiab-clean-usb.sh.unused} (100%)
 rename roles/usb_lib/templates/{umount.d.unused/70-usb-library => umount.d/70-usb-library.j2} (52%)

diff --git a/roles/usb_lib/files/usbmount/iiab-clean-usb.sh b/roles/usb_lib/files/usbmount/iiab-clean-usb.sh.unused
similarity index 100%
rename from roles/usb_lib/files/usbmount/iiab-clean-usb.sh
rename to roles/usb_lib/files/usbmount/iiab-clean-usb.sh.unused
diff --git a/roles/usb_lib/tasks/install.yml b/roles/usb_lib/tasks/install.yml
index cac0c3d58..96ec0eaa2 100644
--- a/roles/usb_lib/tasks/install.yml
+++ b/roles/usb_lib/tasks/install.yml
@@ -95,7 +95,6 @@
     - { src: 'usbmount/usbmount', dest: '/usr/local/sbin/', mode: '0755' }
     - { src: 'usbmount/usbmount.rules', dest: '/etc/udev/rules.d/usbmount.rules', mode: '0644' }
     - { src: 'usbmount/usbmount@.service', dest: '/etc/systemd/system/usbmount@.service', mode: '0644' }
-    - { src: 'usbmount/iiab-clean-usb.sh', dest: '/etc/usbmount/umount.d/iiab-clean-usb.sh', mode: '0755' }
 
 - name: Add dir {{ doc_root }}/upload2usb (0775) owned by {{ apache_user }}:{{ apache_user }}
   file:
diff --git a/roles/usb_lib/tasks/nginx.yml b/roles/usb_lib/tasks/nginx.yml
index 1e6be6d21..3e47dad8f 100644
--- a/roles/usb_lib/tasks/nginx.yml
+++ b/roles/usb_lib/tasks/nginx.yml
@@ -1,3 +1,11 @@
+- name: Install /etc/usbmount/umount.d/70-usb-library from template
+  template:
+    src: umount.d/70-usb-library.j2
+    dest: /etc/usbmount/umount.d/70-usb-library
+    owner: root
+    group: root
+    mode: '0751'
+
 - name: Install /etc/usbmount/mount.d/70-usb-library from template, if usb_lib_enabled
   template:
     src: mount.d/70-usb-library.j2
diff --git a/roles/usb_lib/templates/umount.d.unused/70-usb-library b/roles/usb_lib/templates/umount.d/70-usb-library.j2
similarity index 52%
rename from roles/usb_lib/templates/umount.d.unused/70-usb-library
rename to roles/usb_lib/templates/umount.d/70-usb-library.j2
index d8e095008..4f55d4d6a 100644
--- a/roles/usb_lib/templates/umount.d.unused/70-usb-library
+++ b/roles/usb_lib/templates/umount.d/70-usb-library.j2
@@ -8,17 +8,14 @@
 # <douglas@paradise.net.nz>
 #
 # by Tim Moody tim@timmoody.com
+#    Jerry Vonau jvonau3@gmail.com
 
-CONTENT_LINK_USB=`basename $UM_MOUNTPOINT | awk '{print toupper($0)}'`
+CONTENT_LINK_USB=$(basename $UM_MOUNTPOINT | awk '{print toupper($0)}')
 CONTENT_LINK="{{ doc_root }}/local_content/$CONTENT_LINK_USB"
 
-logger -p user.notice -t "usb_lib (70-usb-library)" -- "Attempting to remove link $CONTENT_LINK."
+logger -p user.notice -t "usbmount (70-usb-library)" -- "Attempting to remove link $CONTENT_LINK."
 
 if [ -L $CONTENT_LINK ]; then
-{% if is_debuntu %}
-  /bin/rm -f $CONTENT_LINK
-{% else %}
-  /usr/bin/rm -f $CONTENT_LINK
-{% endif %}
-  logger -p user.notice -t "usb_lib (70-usb-library)" -- "$CONTENT_LINK removed."
+    rm -f $CONTENT_LINK
+    logger -p user.notice -t "usbmount (70-usb-library)" -- "$CONTENT_LINK removed."
 fi