paulmataruso/docker-zulip
1
0
Fork 0
mirror of https://github.com/zulip/docker-zulip.git synced 2025-11-06 06:53:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add AUTH_LDAP_CONNECTION_OPTIONS and organize conditions

Browse Source 
fixes #127
This commit is contained in:
Giora Guttsait
2018-06-28 20:44:05 +03:00
committed by Tim Abbott
parent fad2cf528b
commit 283c23fd0b
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
entrypoint.sh
View File

@@ -277,15 +277,21 @@ zulipConfiguration() {
continue continue
fi fi
# Zulip settings.py / zproject specific overrides here # Zulip settings.py / zproject specific overrides here
if [ "$setting_key" = "AUTH_LDAP_USER_SEARCH" ] || [ "$setting_key" = "AUTH_LDAP_USER_ATTR_MAP" ] || \ if [ "$setting_key" = "AUTH_LDAP_CONNECTION_OPTIONS" ] || \
([ "$setting_key" = "LDAP_APPEND_DOMAIN" ] && [ "$setting_var" = "None" ]) || [ "$setting_key" = "SECURE_PROXY_SSL_HEADER" ] || \ [ "$setting_key" = "AUTH_LDAP_USER_SEARCH" ] || \
[[ "$setting_key" = "CSRF_"* ]] || [[ "$setting_key" = "ALLOWED_HOSTS" ]]; then [ "$setting_key" = "AUTH_LDAP_USER_ATTR_MAP" ] || \
([ "$setting_key" = "LDAP_APPEND_DOMAIN" ] && [ "$setting_var" = "None" ]) || \
[ "$setting_key" = "SECURE_PROXY_SSL_HEADER" ] || \
[[ "$setting_key" = "CSRF_"* ]] || \
[ "$setting_key" = "ALLOWED_HOSTS" ]; then
type="array" type="array"
fi fi
if ([ "$SPECIAL_SETTING_DETECTION_MODE" = "True" ] || [ "$SPECIAL_SETTING_DETECTION_MODE" = "true" ]) || [ "$type" = "string" ]; then if ([ "$SPECIAL_SETTING_DETECTION_MODE" = "True" ] || [ "$SPECIAL_SETTING_DETECTION_MODE" = "true" ]) || \
[ "$type" = "string" ]; then
type="" type=""
fi fi
if [ "$setting_key" = "EMAIL_HOST_USER" ] || [ "$setting_key" = "EMAIL_HOST_PASSWORD" ] || \ if [ "$setting_key" = "EMAIL_HOST_USER" ] || \
[ "$setting_key" = "EMAIL_HOST_PASSWORD" ] || \
[ "$setting_key" = "EXTERNAL_HOST" ]; then [ "$setting_key" = "EXTERNAL_HOST" ]; then
type="string" type="string"
fi fi