Merge pull request #382 from GeorgianaElena/issue349

Allow adding users to specific groups
This commit is contained in:
Min RK
2019-07-12 09:38:21 +02:00
committed by GitHub
5 changed files with 107 additions and 0 deletions

View File

@@ -27,6 +27,7 @@ default = {
'allowed': [],
'banned': [],
'admin': [],
'extra_user_groups': {}
},
'limits': {
'memory': None,
@@ -93,6 +94,7 @@ def apply_config(config_overrides, c):
update_auth(c, tljh_config)
update_userlists(c, tljh_config)
update_usergroups(c, tljh_config)
update_limits(c, tljh_config)
update_user_environment(c, tljh_config)
update_user_account_config(c, tljh_config)
@@ -168,6 +170,14 @@ def update_userlists(c, config):
c.Authenticator.admin_users = set(users['admin'])
def update_usergroups(c, config):
"""
Set user groups
"""
users = config['users']
c.UserCreatingSpawner.user_groups = users['extra_user_groups']
def update_limits(c, config):
"""
Set user server limits