Merge pull request #915 from consideRatio/pr/update-systemdspawner

Update systemdspawner from version 0.17.* to >=1.0.1,<2
This commit is contained in:
Erik Sundell
2023-06-08 15:37:16 +02:00
committed by GitHub
2 changed files with 4 additions and 2 deletions

View File

@@ -8,8 +8,8 @@
# If a dependency is bumped to a new major version, we should make a major # If a dependency is bumped to a new major version, we should make a major
# version release of tljh. # version release of tljh.
# #
jupyterhub>=4.0.0,<5 jupyterhub>=4.0.1,<5
jupyterhub-systemdspawner>=0.17.0,<1 jupyterhub-systemdspawner>=1.0.1,<2
jupyterhub-firstuseauthenticator>=1.0.0,<2 jupyterhub-firstuseauthenticator>=1.0.0,<2
jupyterhub-nativeauthenticator>=1.2.0,<2 jupyterhub-nativeauthenticator>=1.2.0,<2
jupyterhub-ldapauthenticator>=1.3.2,<2 jupyterhub-ldapauthenticator>=1.3.2,<2

View File

@@ -26,8 +26,10 @@ class UserCreatingSpawner(SystemdSpawner):
user.ensure_user(system_username) user.ensure_user(system_username)
user.ensure_user_group(system_username, "jupyterhub-users") user.ensure_user_group(system_username, "jupyterhub-users")
if self.user.admin: if self.user.admin:
self.disable_user_sudo = False
user.ensure_user_group(system_username, "jupyterhub-admins") user.ensure_user_group(system_username, "jupyterhub-admins")
else: else:
self.disable_user_sudo = True
user.remove_user_group(system_username, "jupyterhub-admins") user.remove_user_group(system_username, "jupyterhub-admins")
if self.user_groups: if self.user_groups:
for group, users in self.user_groups.items(): for group, users in self.user_groups.items():