entrypoint: Reorganize settings at top, make complete.

Author: alexmv

entrypoint.sh

@@ -31,42 +31,57 @@ normalize_bool() {
     esac
 }
 
-# DB aka Database
+## Settings
+
+# PostgreSQL
 DB_HOST="${DB_HOST:-127.0.0.1}"
 DB_HOST_PORT="${DB_HOST_PORT:-5432}"
 DB_NAME="${DB_NAME:-zulip}"
 DB_USER="${DB_USER:-zulip}"
 REMOTE_POSTGRES_SSLMODE="${REMOTE_POSTGRES_SSLMODE:-prefer}"
+
 # RabbitMQ
 SETTING_RABBITMQ_HOST="${SETTING_RABBITMQ_HOST:-127.0.0.1}"
 SETTING_RABBITMQ_USER="${SETTING_RABBITMQ_USER:-zulip}"
 
 # Redis
 SETTING_REDIS_HOST="${SETTING_REDIS_HOST:-127.0.0.1}"
 SETTING_REDIS_PORT="${SETTING_REDIS_PORT:-6379}"
+
 # Memcached
 SETTING_MEMCACHED_LOCATION="${SETTING_MEMCACHED_LOCATION:-127.0.0.1:11211}"
-# Nginx settings
+
+# Nginx and HTTP(S) settings
 DISABLE_HTTPS="$(normalize_bool DISABLE_HTTPS)"
 NGINX_WORKERS="${NGINX_WORKERS:-2}"
 NGINX_MAX_UPLOAD_SIZE="${NGINX_MAX_UPLOAD_SIZE:-80m}"
+LOADBALANCER_IPS="${LOADBALANCER_IPS:-}"
 TRUST_GATEWAY_IP="$(normalize_bool TRUST_GATEWAY_IP)"
-# Zulip certificate parameters
 SSL_CERTIFICATE_GENERATION="${SSL_CERTIFICATE_GENERATION:-self-signed}"
-# Zulip related settings
+
+# Outgoing proxy settings
+PROXY_ALLOW_ADDRESSES="${PROXY_ALLOW_ADDRESSES:-}"
+PROXY_ALLOW_RANGES="${PROXY_ALLOW_RANGES:-}"
+
+# Core Zulip settings
 ZULIP_AUTH_BACKENDS="${ZULIP_AUTH_BACKENDS:-EmailAuthBackend}"
-ZULIP_RUN_POST_SETUP_SCRIPTS="$(normalize_bool ZULIP_RUN_POST_SETUP_SCRIPTS True)"
 QUEUE_WORKERS_MULTIPROCESS="$(normalize_bool QUEUE_WORKERS_MULTIPROCESS)"
-# Zulip user setup
+
+# Configuration controls
 FORCE_FIRST_START_INIT="$(normalize_bool FORCE_FIRST_START_INIT)"
+ZULIP_RUN_POST_SETUP_SCRIPTS="$(normalize_bool ZULIP_RUN_POST_SETUP_SCRIPTS True)"
+ZULIP_CUSTOM_SETTINGS="${ZULIP_CUSTOM_SETTINGS:-}"
+MANUAL_CONFIGURATION="$(normalize_bool MANUAL_CONFIGURATION)"
+LINK_SETTINGS_TO_DATA="$(normalize_bool LINK_SETTINGS_TO_DATA)"
+
 # Auto backup settings
 AUTO_BACKUP_ENABLED="$(normalize_bool AUTO_BACKUP_ENABLED True)"
 AUTO_BACKUP_INTERVAL="${AUTO_BACKUP_INTERVAL:-30 3 * * *}"
-# Zulip configuration function specific variable(s)
-MANUAL_CONFIGURATION="$(normalize_bool MANUAL_CONFIGURATION)"
-LINK_SETTINGS_TO_DATA="$(normalize_bool LINK_SETTINGS_TO_DATA)"
-# entrypoint.sh specific variable(s)
+
+## Constants
 SETTINGS_PY="/etc/zulip/settings.py"
+
+## Global state
 GENERATE_CERTBOT_CERT_SCHEDULED=""
 
 # BEGIN appRun functions