diff --git a/app.json b/app.json index 649d48dc3b1c..8c8d262f8a76 100644 --- a/app.json +++ b/app.json @@ -33,10 +33,6 @@ "APPSMITH_DISABLE_TELEMETRY": { "description" : "We want to be transparent and request that you share anonymous usage data with us. This data is purely statistical in nature and helps us understand your needs & provide better support to your self-hosted instance. You can read more about what information is collected in our documentation https://docs.appsmith.com/product/telemetry", "value": "false" - }, - "APPSMITH_SUPERVISOR_PASSWORD": { - "description": "Basic authentication password to access Supervisor UI - An web interface, which allow you to manage various process", - "value": "" - } + } } } diff --git a/deploy/docker/fs/etc/supervisor/supervisord.conf b/deploy/docker/fs/etc/supervisor/supervisord.conf index eb1bedac47a7..121e95b7c548 100644 --- a/deploy/docker/fs/etc/supervisor/supervisord.conf +++ b/deploy/docker/fs/etc/supervisor/supervisord.conf @@ -4,11 +4,6 @@ file=%(ENV_TMP)s/supervisor.sock ; (the path to the socket file) chmod=0700 ; sockef file mode (default 0700) -[inet_http_server] ; inet (TCP) server disabled by default -port=*:9001 ; (ip_address:port specifier, *:port for all iface) -username=%(ENV_APPSMITH_SUPERVISOR_USER)s -password=%(ENV_APPSMITH_SUPERVISOR_PASSWORD)s - [supervisord] logfile=%(ENV_APPSMITH_LOG_DIR)s/supervisor/%(ENV_HOSTNAME)s-stdout.log ; (main log file;default $CWD/supervisord.log) pidfile=%(ENV_TMP)s/supervisord.pid ; (supervisord pidfile;default supervisord.pid) diff --git a/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs b/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs index 4f5c94134adc..0fa24ce10423 100644 --- a/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs +++ b/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs @@ -144,11 +144,6 @@ parts.push(` import reverse_proxy 8091 } - redir /supervisor /supervisor/ - handle_path /supervisor/* { - import reverse_proxy 9001 - } - ${isRateLimitingEnabled ? `rate_limit { zone dynamic_zone { # This key is designed to work irrespective of any load balancers running on the Appsmith container. diff --git a/deploy/docker/fs/opt/appsmith/entrypoint.sh b/deploy/docker/fs/opt/appsmith/entrypoint.sh index 50cc0fe54acc..7cf1f00403dc 100644 --- a/deploy/docker/fs/opt/appsmith/entrypoint.sh +++ b/deploy/docker/fs/opt/appsmith/entrypoint.sh @@ -98,16 +98,12 @@ init_env_file() { tr -dc A-Za-z0-9 "$ENV_PATH" + bash "$TEMPLATES_PATH/docker.env.sh" "$default_appsmith_mongodb_user" "$generated_appsmith_mongodb_password" "$generated_appsmith_encryption_password" "$generated_appsmith_encription_salt" "$generated_appsmith_redis_password" > "$ENV_PATH" else tlog "Configuration file already exists" # Backfill APPSMITH_REDIS_PASSWORD for existing installs that don't have it yet. @@ -224,12 +220,6 @@ unset_unused_variables() { unset APPSMITH_RECAPTCHA_SECRET_KEY unset APPSMITH_RECAPTCHA_ENABLED fi - - export APPSMITH_SUPERVISOR_USER="${APPSMITH_SUPERVISOR_USER:-appsmith}" - if [[ -z "${APPSMITH_SUPERVISOR_PASSWORD-}" ]]; then - APPSMITH_SUPERVISOR_PASSWORD="$(tr -dc A-Za-z0-9