diff --git a/README.md b/README.md index 0ca4fec3901f163fef1263173b780899a2f7a980..78c6fca0eb7792bd7d7d92b85d1822c0a1c2f41a 100644 --- a/README.md +++ b/README.md @@ -95,6 +95,8 @@ After running the migrations you can remove all `LDAP_*`-prefixed settings from Upgrading will not perform any write access to the LDAP server. +If the config option `ACL_SELFSERVICE_GROUP` is set but not `ACL_ACCESS_GROUP`, make sure to set `ACL_ACCESS_GROUP` to the same value as `ACL_SELFSERVICE_GROUP`, + ## Python Coding Style Conventions PEP 8 without double new lines, tabs instead of spaces and a max line length of 160 characters. diff --git a/uffd/__init__.py b/uffd/__init__.py index ae8853580c339a158c9bad16ec3f3109c0b9a655..e370e999cdfcb4321e55bedb2d8b117100136165 100644 --- a/uffd/__init__.py +++ b/uffd/__init__.py @@ -53,8 +53,6 @@ def init_config(app: Flask, test_config): for filename in ["config.cfg", "config.json", "config.yml", "config.yaml"]: if load_config_file(app, os.path.join(app.instance_path, filename), silent=True): break - # Prior to v1.1 login required ACL_SELFSERVICE_GROUP and ACL_ACCESS_GROUP did not exist - app.config.setdefault('ACL_ACCESS_GROUP', app.config['ACL_SELFSERVICE_GROUP']) if app.env == "production" and app.secret_key is None: raise Exception("SECRET_KEY not configured and we are running in production mode!") diff --git a/uffd/default_config.cfg b/uffd/default_config.cfg index f869cc67923252917892d9dd64a7a2cc3fa69d4a..0628f1068c65c8606597caba3fc757dafd56d83b 100644 --- a/uffd/default_config.cfg +++ b/uffd/default_config.cfg @@ -22,7 +22,7 @@ ACL_ADMIN_GROUP="uffd_admin" # Group required to access selfservice functions (view selfservice, change profile/password/roles) ACL_SELFSERVICE_GROUP="uffd_access" # Group required to login -#ACL_ACCESS_GROUP="uffd_access" # if unset, the value of ACL_SELFSERVICE_GROUP is used +ACL_ACCESS_GROUP="uffd_access" # Members can create invite links for signup ACL_SIGNUP_GROUP="uffd_signup"