diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d98ebe2e0f8dfe3f7e4a69d4341b32d1734ca04b..0008447ae734c02bf1ed7d84c4b2b6e34cda5372 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,7 +68,7 @@ docker-push: services: - docker:dind script: - # every commit on main branch should build and push image as unstable + # every commit on main branch builds and pushes the image with labels "main" and "main-{hash}" # elseif its a protected branch build and push to gitlab registry # else it is from a tag (enforced by gitlab-ci rules) # hint: tags are references independent of branches diff --git a/steering/sample_settings.py b/steering/sample_settings.py index e0d02f4d77a26c5bd0594578b345ed0c710c9c1f..6f414bfaf9ebe09a83606ee842ce506c6c7ff8a7 100644 --- a/steering/sample_settings.py +++ b/steering/sample_settings.py @@ -1,9 +1,10 @@ -# sample settings for steering +# Advanced settings for Steering +# Go to https://docs.aura.radio to learn how to configure LDAP. -from .settings import * # noqa - -ADMINS = [("Ernesto", "ernesto@helsinki.at")] -MANAGERS = ADMINS - -TIME_ZONE = "America/La_Paz" +# import the base settings +from steering.settings import * # noqa +# Import classes, functions, etc. +from django_auth_ldap.config import GroupOfNamesType +# and use them to extend or overwrite settings +AUTH_LDAP_GROUP_TYPE = GroupOfNamesType(name_attr="cn") \ No newline at end of file