Merge branch 'feature/pcartas'

pcartas · Sep 25, 2024 · bc8a384 · bc8a384
2 parents c33a8b2 + c1f7cfe
commit bc8a384
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/tljh/configurer.py b/tljh/configurer.py
@@ -244,7 +244,7 @@ def update_user_environment(c, config):
 
 
 def update_user_account_config(c, config):
-    c.SystemdSpawner.username_template = "{USERNAME_PREFIX}{USERNAME}"
+    c.SystemdSpawner.username_template =  USERNAME_PREFIX+"{USERNAME}"
 
 
 def update_traefik_api(c, config):

diff --git a/tljh/installer.py b/tljh/installer.py
@@ -26,6 +26,8 @@
     INSTALL_PREFIX,
     STATE_DIR,
     USER_ENV_PREFIX,
+    HASH_USERNAME,
+    USERNAME_PREFIX,
 )
 from .utils import parse_version as V
 from .yaml import yaml
@@ -82,6 +84,8 @@ def ensure_jupyterhub_service(prefix):
         python_interpreter_path=sys.executable,
         jupyterhub_config_path=os.path.join(HERE, "jupyterhub_config.py"),
         install_prefix=INSTALL_PREFIX,
+        usernames_prefix=USERNAME_PREFIX,
+        hash_usernames=HASH_USERNAME
     )
     systemd.install_unit("jupyterhub.service", hub_unit_template.format(**unit_params))
     systemd.install_unit("traefik.service", traefik_unit_template.format(**unit_params))

diff --git a/tljh/systemd-units/jupyterhub.service b/tljh/systemd-units/jupyterhub.service
@@ -15,6 +15,8 @@ PrivateDevices=yes
 ProtectKernelTunables=yes
 ProtectKernelModules=yes
 Environment=TLJH_INSTALL_PREFIX={install_prefix}
+Environment=TLJH_HASH_USERNAME={hash_usernames}
+Environment=TLJH_USERNAME_PREFIX={usernames_prefix}
 Environment=PATH={install_prefix}/hub/bin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 # Run upgrade-db before starting, in case Hub version has changed
 # This is a no-op when no db exists or no upgrades are needed