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

Merge pull request #98 from Exocortex/EMAIL_HOST_USER_string

Browse Source 
allow EMAIL_HOST_USER and EMAIL_HOST_PASSWORD to start with a number
This commit is contained in:
Alexander Trost
2018-04-20 23:12:04 +02:00
committed by GitHub
parent 1b4cedf36b bf319d5702
commit 0de3ff783f
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
entrypoint.sh
View File

@@ -310,7 +310,8 @@ zulipConfiguration() {
[ "$setting_key" = "ZULIP_ADMINISTRATOR" ] || [ "$setting_key" = "ADMIN_DOMAIN" ] || \ [ "$setting_key" = "ZULIP_ADMINISTRATOR" ] || [ "$setting_key" = "ADMIN_DOMAIN" ] || \
[ "$setting_key" = "SECRET_KEY" ] || [ "$setting_key" = "NOREPLY_EMAIL_ADDRESS" ] || \ [ "$setting_key" = "SECRET_KEY" ] || [ "$setting_key" = "NOREPLY_EMAIL_ADDRESS" ] || \
[ "$setting_key" = "DEFAULT_FROM_EMAIL" ] || [ "$setting_key" = "ALLOWED_HOSTS" ] || \ [ "$setting_key" = "DEFAULT_FROM_EMAIL" ] || [ "$setting_key" = "ALLOWED_HOSTS" ] || \
[[ "$setting_key" = AUTH_* ]] || [[ "$setting_key" = LDAP_* ]]; then [[ "$setting_key" = AUTH_* ]] || [[ "$setting_key" = LDAP_* ]] || \
[[ "$setting_key" = EMAIL* ]] ; then
file="$SETTINGS_PY" file="$SETTINGS_PY"
fi fi
if [ "$setting_key" = "AUTH_LDAP_USER_SEARCH" ] || [ "$setting_key" = "AUTH_LDAP_USER_ATTR_MAP" ] || \ if [ "$setting_key" = "AUTH_LDAP_USER_SEARCH" ] || [ "$setting_key" = "AUTH_LDAP_USER_ATTR_MAP" ] || \
@@ -321,6 +322,9 @@ zulipConfiguration() {
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" ]; then
type="string"
fi
setConfigurationValue "$setting_key" "$setting_var" "$file" "$type" setConfigurationValue "$setting_key" "$setting_var" "$file" "$type"
done done
unset setting_key setting_var unset setting_key setting_var