Skip to content

Commit 5b23f35

Browse files
committed
entrypoint: Remove confusing SPECIAL_SETTING_DETECTION_MODE.
Defaulting to "False", this had the effect, if "True", of undoing the special-setting detection for the hard-coded list of setting names, and attempting to guess based only on the value. The name is at odds with the behaviour, and the behaviour seems unlikely to have been wanted.
1 parent a726c16 commit 5b23f35

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

entrypoint.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ FORCE_FIRST_START_INIT="$(normalize_bool FORCE_FIRST_START_INIT)"
6666
AUTO_BACKUP_ENABLED="$(normalize_bool AUTO_BACKUP_ENABLED True)"
6767
AUTO_BACKUP_INTERVAL="${AUTO_BACKUP_INTERVAL:-30 3 * * *}"
6868
# Zulip configuration function specific variable(s)
69-
SPECIAL_SETTING_DETECTION_MODE="$(normalize_bool SPECIAL_SETTING_DETECTION_MODE)"
7069
MANUAL_CONFIGURATION="$(normalize_bool MANUAL_CONFIGURATION)"
7170
LINK_SETTINGS_TO_DATA="$(normalize_bool LINK_SETTINGS_TO_DATA)"
7271
# entrypoint.sh specific variable(s)
@@ -307,7 +306,7 @@ zulipConfiguration() {
307306
[[ "$key" == SETTING_*([0-9A-Za-z_]) ]] || continue
308307
local setting_key="${key#SETTING_}"
309308
local setting_var="${!key}"
310-
local type="string"
309+
local type=""
311310
if [ -z "$setting_var" ]; then
312311
echo "Empty var for key \"$setting_key\"."
313312
continue
@@ -335,9 +334,6 @@ zulipConfiguration() {
335334
|| [ "$setting_key" = "ALLOWED_HOSTS" ]; then
336335
type="array"
337336
fi
338-
if [ "$SPECIAL_SETTING_DETECTION_MODE" = "True" ] || [ "$type" = "string" ]; then
339-
type=""
340-
fi
341337
if [ "$setting_key" = "EMAIL_HOST_USER" ] \
342338
|| [ "$setting_key" = "EMAIL_HOST_PASSWORD" ] \
343339
|| [ "$setting_key" = "EXTERNAL_HOST" ]; then

0 commit comments

Comments
 (0)