From 0b6c062e324e6917686218c87ce2526d5137ec6f Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Fri, 24 Feb 2017 13:20:29 -0500 Subject: [PATCH] Add superuser panel config for team syncing --- .../directives/config/config-setup-tool.html | 28 +++++++++++++++++-- util/config/configutil.py | 1 + 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/static/directives/config/config-setup-tool.html b/static/directives/config/config-setup-tool.html index ead4609bf..226a7f8da 100644 --- a/static/directives/config/config-setup-tool.html +++ b/static/directives/config/config-setup-tool.html @@ -194,7 +194,7 @@ > + validator="validateHostname(value)"> @@ -553,7 +553,7 @@ prevent passwords from being saved as plaintext by the Docker client. - +
+ + + + + + + + +
Authentication: @@ -565,6 +565,28 @@
Team synchronization: +
+ Enable Team Synchronization Support +
+
+ If enabled, organization administrators who are also superusers can set teams to have their membership synchronized with a backing group in {{ config.AUTHENTICATION_TYPE }}. +
+
Resynchronization duration: + +
+ The duration before a team must be re-synchronized. Must be expressed in a duration string form: 30m, 1h, 1d. +
+
@@ -758,7 +780,7 @@ Administrator DN Password: -
+
Note: This will be stored in plaintext inside the config.yaml, so setting up a dedicated account or using a password hash is highly recommended. diff --git a/util/config/configutil.py b/util/config/configutil.py index c52d22928..e1105d9f7 100644 --- a/util/config/configutil.py +++ b/util/config/configutil.py @@ -76,3 +76,4 @@ def add_enterprise_config_defaults(config_obj, current_secret_key, hostname): config_obj['PREFERRED_URL_SCHEME'] = config_obj.get('PREFERRED_URL_SCHEME', 'http') config_obj['ENTERPRISE_LOGO_URL'] = config_obj.get( 'ENTERPRISE_LOGO_URL', '/static/img/quay-logo.png') + config_obj['TEAM_RESYNC_STALE_TIME'] = '60m'