fix: Register jupyterhub api token (#86)

IllumiDesk · May 26, 2020 · 9342037 · 9342037
1 parent 0160d3e
commit 9342037
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/ansible/roles/jupyterhub/files/jupyterhub_config_fu.py b/ansible/roles/jupyterhub/files/jupyterhub_config_fu.py
@@ -219,10 +219,12 @@
 
 # Mount volumes
 c.DockerSpawner.volumes = {
-    f'{mnt_root}/{org_name}' + '/home/{username}': notebook_dir,
+    f'{mnt_root}/{org_name}' + '/home/{raw_username}': notebook_dir,
     f'{mnt_root}/{org_name}/exchange': exchange_dir,
 }
 
+c.DockerSpawner.name_template = 'jupyter-{raw_username}'
+
 ##########################################
 # END CUSTOM DOCKERSPAWNER
 ##########################################
diff --git a/ansible/roles/jupyterhub/files/jupyterhub_config_lti11.py b/ansible/roles/jupyterhub/files/jupyterhub_config_lti11.py
@@ -49,12 +49,16 @@
 c.JupyterHub.admin_access = True
 
 # Define some static services that jupyterhub will manage
+# Although the cull-idle service is internal, and therefore does not need an explicit
+# registration of the jupyterhub api token, we add it here so the internal api client
+# can use the token to utilize RESTful endpoints with full CRUD priviledges.
 announcement_port = os.environ.get('ANNOUNCEMENT_SERVICE_PORT') or '8889'
 c.JupyterHub.services = [
     {
         'name': 'idle-culler',
         'admin': True,
         'command': [sys.executable, '-m', 'jupyterhub_idle_culler', '--timeout=3600'],
+        'api_token': os.environ.get('JUPYTERHUB_API_TOKEN'),
     },
     {
         'name': 'announcement',

diff --git a/ansible/roles/jupyterhub/files/jupyterhub_config_lti13.py b/ansible/roles/jupyterhub/files/jupyterhub_config_lti13.py
@@ -65,12 +65,16 @@
 c.JupyterHub.admin_access = True
 
 # Define some static services that jupyterhub will manage
+# Although the cull-idle service is internal, and therefore does not need an explicit
+# registration of the jupyterhub api token, we add it here so the internal api client
+# can use the token to utilize RESTful endpoints with full CRUD priviledges.
 announcement_port = os.environ.get('ANNOUNCEMENT_SERVICE_PORT') or '8889'
 c.JupyterHub.services = [
     {
         'name': 'idle-culler',
         'admin': True,
         'command': [sys.executable, '-m', 'jupyterhub_idle_culler', '--timeout=3600'],
+        'api_token': os.environ.get('JUPYTERHUB_API_TOKEN'),
     },
     {
         'name': 'announcement',