From 442ae83280c29cf1b5e14ff4a3dee1c5cf8c590e Mon Sep 17 00:00:00 2001 From: lolwierd Date: Fri, 27 Mar 2026 15:10:54 +0530 Subject: [PATCH] fix: use dynamic APP_UPSTREAM_PORT in domain and install scripts --- signoz/domain.sh | 27 ++++++++++++++------------- signoz/install.sh | 5 +++-- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/signoz/domain.sh b/signoz/domain.sh index b22f4c9..fd78851 100644 --- a/signoz/domain.sh +++ b/signoz/domain.sh @@ -3,6 +3,7 @@ APP_NAME="signoz" APP_DIR="/var/excloud/apps" SCRIPT_DIR="/var/excloud/scripts" +APP_UPSTREAM_PORT="${EXC_APP_UPSTREAM_PORT:-8080}" DOMAIN="${1}" @@ -37,7 +38,7 @@ set_env "SIGNOZ_ALERTMANAGER_SIGNOZ_EXTERNAL_URL" "${URL}" ".services.signoz.env cat > /etc/caddy/Caddyfile << EOF ${URL} { - reverse_proxy localhost:8080 + reverse_proxy localhost:${APP_UPSTREAM_PORT} } ${URL}:4317 { @@ -47,20 +48,20 @@ ${URL}:4317 { ${URL}:4318 { reverse_proxy localhost:44318 } -${INTERNAL_URL} { - reverse_proxy localhost:8080 -} - -${INTERNAL_URL}:4317 { - reverse_proxy h2c://localhost:44317 -} - -${INTERNAL_URL}:4318 { - reverse_proxy localhost:44318 -} +# ${INTERNAL_URL} { +# reverse_proxy localhost:${APP_UPSTREAM_PORT} +# } +# +# ${INTERNAL_URL}:4317 { +# reverse_proxy h2c://localhost:44317 +# } +# +# ${INTERNAL_URL}:4318 { +# reverse_proxy localhost:44318 +# } EOF echo "Caddyfile updated" docker compose -f $COMPOSE_FILE up -d --remove-orphans -systemctl reload caddy \ No newline at end of file +systemctl reload caddy diff --git a/signoz/install.sh b/signoz/install.sh index bb0fd0b..8d28ec7 100644 --- a/signoz/install.sh +++ b/signoz/install.sh @@ -4,6 +4,7 @@ APP_NAME="signoz" APP_DIR="/var/excloud/apps" SCRIPT_DIR="/var/excloud/scripts" POSTGRES_DSN="postgres://postgres:your_password@localhost:5432/signoz?sslmode=disable" +APP_UPSTREAM_PORT="${EXC_APP_UPSTREAM_PORT:-8080}" mkdir -p "${APP_DIR}" mkdir -p "${SCRIPT_DIR}" @@ -69,11 +70,11 @@ set_env() { set_port "127.0.0.1:44317:4317" "$OTEL_SERVICE_PATH" set_port "127.0.0.1:44318:4318" "$OTEL_SERVICE_PATH" -set_port "127.0.0.1:8080:8080" "$SIGNOZ_SERVICE_PATH" +set_port "127.0.0.1:${APP_UPSTREAM_PORT}:8080" "$SIGNOZ_SERVICE_PATH" set_env "SIGNOZ_TOKENIZER_JWT_SECRET" "${JWT_SECRET}" ".services.signoz.environment" # TODO Add support for postgres DSN # set_env "SIGNOZ_SQLSTORE_PROVIDER" "${JWT_SECRET}" ".services.signoz.environment" # set_env "SIGNOZ_SQLSTORE_POSTGRES_DSN" "${POSTGRES_DSN}" ".services.signoz.environment" -bash "${SCRIPT_DIR}/domain.sh" "${DOMAIN}" \ No newline at end of file +bash "${SCRIPT_DIR}/domain.sh" "${DOMAIN}"