From 61f5f1ce1fc6ca5f553120bcb247b8210653f238 Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Sun, 10 Nov 2024 20:26:18 +1100 Subject: [PATCH] feat: add docker settings - list docker network and image - fix ldap_admin setting to be a list of users --- site/profiles/manifests/jupyter/jupyterhub.pp | 4 +++- site/profiles/templates/jupyterhub/config.py.erb | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/site/profiles/manifests/jupyter/jupyterhub.pp b/site/profiles/manifests/jupyter/jupyterhub.pp index af3bb7f..b551d27 100644 --- a/site/profiles/manifests/jupyter/jupyterhub.pp +++ b/site/profiles/manifests/jupyter/jupyterhub.pp @@ -17,7 +17,9 @@ class profiles::jupyter::jupyterhub ( String $ldap_bind_dn_template = 'cn={username},ou=people,ou=users,dc=main,dc=unkin,dc=net', Boolean $ldap_use_ssl = false, Array $ldap_allowed_groups = ['ou=jupyterhub_user,ou=groups,dc=main,dc=unkin,dc=net'], - Array $ldap_admin_groups = ['ou=jupyterhub_admin,ou=groups,dc=main,dc=unkin,dc=net'], + Array $ldap_admin_users = [], + String $docker_image = 'git.query.consul/unkin/almalinux8-jupyterinstance:latest', + String $docker_network = 'jupyterhub', ){ # ensure nodejs:20 is installed diff --git a/site/profiles/templates/jupyterhub/config.py.erb b/site/profiles/templates/jupyterhub/config.py.erb index d4f964b..acda6e5 100644 --- a/site/profiles/templates/jupyterhub/config.py.erb +++ b/site/profiles/templates/jupyterhub/config.py.erb @@ -39,5 +39,5 @@ c.LDAPAuthenticator.use_ssl = <%= @ldap_use_ssl ? 'True' : 'False' %> # Restrict access to a specific LDAP group c.LDAPAuthenticator.allowed_groups = <%= @ldap_allowed_groups.to_s %> -# Set an LDAP group as admins -c.LDAPAuthenticator.admin_groups = <%= @ldap_admin_groups.to_s %> +# List LDAP users as admins +c.LDAPAuthenticator.admin_users = <%= @ldap_admin_users.to_s %>