From 5dad80366edbc14fd8fdc70661e458aba0c944e7 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Thu, 7 Jul 2022 23:16:58 -0400
Subject: [PATCH] jupyterhub/tasks/install.yml: Nix getsite.py & patch_FUA.sh

---
 roles/jupyterhub/tasks/install.yml | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/roles/jupyterhub/tasks/install.yml b/roles/jupyterhub/tasks/install.yml
index 257f817f3..0018b4422 100644
--- a/roles/jupyterhub/tasks/install.yml
+++ b/roles/jupyterhub/tasks/install.yml
@@ -71,20 +71,21 @@
     src: jupyterhub.service.j2
     dest: /etc/systemd/system/jupyterhub.service
 
-- name: Install {{ jupyterhub_venv }}/bin/getsite.py from template, to fetch site_packages path, e.g. {{ jupyterhub_venv }}/lib/python{{ python_ver }}/site-packages
-  template:
-    src: getsite.py.j2
-    dest: "{{ jupyterhub_venv }}/bin/getsite.py"
-    mode: 0755
-
-- name: Install patch_FUA.sh from template -- to (1) fix async password-changing page, and (2) force usernames to lowercase -- patching $SITE_PACKAGES/firstuseauthenticator/firstuseauthenticator.py
-  template:
-    src: patch_FUA.sh.j2
-    dest: "{{ jupyterhub_venv }}/bin/patch_FUA.sh"
-    mode: 0755
-
-- name: "Run the above two, via: {{ jupyterhub_venv }}/bin/patch_FUA.sh"
-  command: "{{ jupyterhub_venv }}/bin/patch_FUA.sh"
+# 2022-07-07: No longer needed, thx to upstream fixes
+# - name: Install {{ jupyterhub_venv }}/bin/getsite.py from template, to fetch site_packages path, e.g. {{ jupyterhub_venv }}/lib/python{{ python_ver }}/site-packages
+#   template:
+#     src: getsite.py.j2
+#     dest: "{{ jupyterhub_venv }}/bin/getsite.py"
+#     mode: 0755
+#
+# - name: Install patch_FUA.sh from template -- to (1) fix async password-changing page, and (2) force usernames to lowercase -- patching $SITE_PACKAGES/firstuseauthenticator/firstuseauthenticator.py
+#   template:
+#     src: patch_FUA.sh.j2
+#     dest: "{{ jupyterhub_venv }}/bin/patch_FUA.sh"
+#     mode: 0755
+#
+# - name: "Run the above two, via: {{ jupyterhub_venv }}/bin/patch_FUA.sh"
+#   command: "{{ jupyterhub_venv }}/bin/patch_FUA.sh"
 
 - name: Install patch_http-warning.sh from template, to turn off the warning about http insecurity, in {{ jupyterhub_venv }}/share/jupyterhub/templates/login.html
   template: