From da524bfac55b378366ff747e0b46be2969925fe8 Mon Sep 17 00:00:00 2001 From: Surya Prashanth Date: Mon, 28 Apr 2025 14:45:49 +0530 Subject: [PATCH] [SILO-163] chore: create separate env variable for silo callback base url #3060 --- deploy/cli-install/docker-compose-caddy.yml | 2 +- deploy/cli-install/portainer-compose.yml | 2 +- deploy/cli-install/variables.env | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/deploy/cli-install/docker-compose-caddy.yml b/deploy/cli-install/docker-compose-caddy.yml index ffbcac5ccf..9ce171ce91 100644 --- a/deploy/cli-install/docker-compose-caddy.yml +++ b/deploy/cli-install/docker-compose-caddy.yml @@ -67,7 +67,7 @@ x-silo-env: &silo-env APP_BASE_URL: ${SITE_ADDRESS} API_BASE_URL: ${API_BASE_URL:-http://api:8000} - SILO_API_BASE_URL: ${SITE_ADDRESS} + SILO_API_BASE_URL: ${INTEGRATION_CALLBACK_BASE_URL} SILO_BASE_PATH: ${SILO_BASE_PATH:-/silo} WEBHOOK_SECRET: ${WEBHOOK_SECRET:-plane-silo} MQ_PREFETCH_COUNT: ${MQ_PREFETCH_COUNT:-10} diff --git a/deploy/cli-install/portainer-compose.yml b/deploy/cli-install/portainer-compose.yml index 80090ce64f..cc7f08bc8b 100644 --- a/deploy/cli-install/portainer-compose.yml +++ b/deploy/cli-install/portainer-compose.yml @@ -67,7 +67,7 @@ x-silo-env: &silo-env APP_BASE_URL: ${SITE_ADDRESS} API_BASE_URL: ${API_BASE_URL:-http://api:8000} - SILO_API_BASE_URL: ${SITE_ADDRESS} + SILO_API_BASE_URL: ${INTEGRATION_CALLBACK_BASE_URL} SILO_BASE_PATH: ${SILO_BASE_PATH:-/silo} WEBHOOK_SECRET: ${WEBHOOK_SECRET:-plane-silo} MQ_PREFETCH_COUNT: ${MQ_PREFETCH_COUNT:-10} diff --git a/deploy/cli-install/variables.env b/deploy/cli-install/variables.env index 04eaba73a2..780e08e238 100644 --- a/deploy/cli-install/variables.env +++ b/deploy/cli-install/variables.env @@ -85,6 +85,9 @@ PAYMENT_SERVER_BASE_URL=http://monitor:8080 # Silo Server Variables SILO_HMAC_SECRET_KEY=tnbbvj6ATPvze4zaygdujxg4dpk4hqx0WDW +# Silo integration oauth callback fqdn with protocol. Ex: https://plane.example.com +INTEGRATION_CALLBACK_BASE_URL= + # Silo Integration Variables # Github Integration GITHUB_CLIENT_ID=