Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions app.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": ""
}
}
}
}
5 changes: 0 additions & 5 deletions deploy/docker/fs/etc/supervisor/supervisord.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 0 additions & 5 deletions deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
12 changes: 1 addition & 11 deletions deploy/docker/fs/opt/appsmith/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,12 @@ init_env_file() {
tr -dc A-Za-z0-9 </dev/urandom | head -c 13
echo ""
)
local generated_appsmith_supervisor_password=$(
tr -dc A-Za-z0-9 </dev/urandom | head -c 13
echo ''
)
local generated_appsmith_redis_password=$(
tr -dc A-Za-z0-9 </dev/urandom | head -c 13
echo ''
)

bash "$TEMPLATES_PATH/docker.env.sh" "$default_appsmith_mongodb_user" "$generated_appsmith_mongodb_password" "$generated_appsmith_encryption_password" "$generated_appsmith_encription_salt" "$generated_appsmith_supervisor_password" "$generated_appsmith_redis_password" > "$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.
Expand Down Expand Up @@ -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 </dev/urandom | head -c 13)"
export APPSMITH_SUPERVISOR_PASSWORD
fi
}

configure_database_connection_url() {
Expand Down
6 changes: 1 addition & 5 deletions deploy/docker/fs/opt/appsmith/templates/docker.env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ MONGO_USER="$1"
DB_PASSWORD="$2"
ENCRYPTION_PASSWORD="$3"
ENCRYPTION_SALT="$4"
SUPERVISOR_PASSWORD="$5"
REDIS_PASSWORD="${6:-}"
REDIS_PASSWORD="${5:-}"

cat <<EOF
# Sentry
Expand Down Expand Up @@ -79,9 +78,6 @@ APPSMITH_JAVA_ARGS=
# MAX PAYLOAD SIZE
# APPSMITH_CODEC_SIZE=

APPSMITH_SUPERVISOR_USER=appsmith
APPSMITH_SUPERVISOR_PASSWORD=$SUPERVISOR_PASSWORD

# Set this to a space separated list of addresses that should be allowed to load Appsmith in a frame.
# Example: "https://mydomain.com https://another-trusted-domain.com" will allow embedding on those two domains.
# Default value, if commented or not set, is "'none'", which disables embedding completely.
Expand Down
Loading