From e02c43480798f059d89eb8babbfd436994408941 Mon Sep 17 00:00:00 2001
From: Jeremy Tuloup <jeremy.tuloup@gmail.com>
Date: Wed, 22 Nov 2023 19:08:55 +0200
Subject: [PATCH] Update to TLJH 1.0

---
 ansible/tljh.yml         | 5 +----
 ansible/vars/default.yml | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/ansible/tljh.yml b/ansible/tljh.yml
index 5c46e01..446de11 100644
--- a/ansible/tljh.yml
+++ b/ansible/tljh.yml
@@ -26,11 +26,8 @@
 
     - name: Run the TLJH installer
       shell: |
-        {{ ansible_python_interpreter }} {{ tljh_installer_dest }} --no-user-env \
+        {{ ansible_python_interpreter }} {{ tljh_installer_dest }} \
           --plugin {{ tljh_plasma }} {{ tljh_repo2docker }}
-      # TODO: remove when --no-user-env (or equivalent) is available
-      environment:
-        TLJH_BOOTSTRAP_PIP_SPEC: "{{ tljh_bootstrap_pip_spec }}"
 
     - name: Set the idle culler timeout to 1 hour
       shell: "tljh-config set services.cull.timeout 3600"
diff --git a/ansible/vars/default.yml b/ansible/vars/default.yml
index 2d992cd..a960f4e 100644
--- a/ansible/vars/default.yml
+++ b/ansible/vars/default.yml
@@ -4,9 +4,6 @@ tljh_plasma: git+https://github.com/plasmabio/plasma@master#"egg=tljh-plasma&sub
 tljh_repo2docker: git+https://github.com/plasmabio/tljh-repo2docker@master
 tljh_installer_dest: /srv/tljh-installer.py
 tljh_prefix: /opt/tljh
-# TODO: update to upstream TLJH links when the --no-user-env (or similar) is available
-# See https://github.com/jupyterhub/the-littlest-jupyterhub/pull/528
-tljh_bootstrap_pip_spec: git+https://github.com/jtpio/the-littlest-jupyterhub.git@skip-install#"egg=the_littlest_jupyterhub"
-tljh_installer_url: https://raw.githubusercontent.com/jtpio/the-littlest-jupyterhub/skip-install/bootstrap/bootstrap.py
+tljh_installer_url: https://tljh.jupyter.org/bootstrap.py
 
 ...