Merge remote-tracking branch 'refs/remotes/origin/24.9-release' into 24.9-release

docker-compose.yaml

@@ -8,12 +8,12 @@ services:
     ports:
       - ${OT_FRONTEND_EXP_PORT:-8080}:80
     environment:
-      CONTROLLER_HOST: ${CONTROLLER_DOMAIN}
+      CONTROLLER_HOST: ${CONTROLLER_DOMAIN:-controller.${OT_DOMAIN}}
       BASE_URL: https://${OT_DOMAIN}
-      OIDC_ISSUER: https://${KC_HOSTNAME}/auth/realms/${KC_REALM_ID:-opentalk}
+      OIDC_ISSUER: https://${KC_HOSTNAME:-accounts.${OT_DOMAIN}}/auth/realms/${KC_REALM_ID:-opentalk}
       OIDC_CLIENT_ID: ${OIDC_CLIENT_ID:-OtFrontend}
       NDT_SERVER: ${NDT_SERVER:-ndt.example.com}
-      CHANGE_PASSWORD_URL: https://${KC_HOSTNAME}/auth/realms/${KC_REALM_ID:-opentalk}/account/
+      CHANGE_PASSWORD_URL: https://${KC_HOSTNAME:-accounts.${OT_DOMAIN}}/auth/realms/${KC_REALM_ID:-opentalk}/account/
       ERROR_REPORT_ADDRESS: ${ERROR_REPORT_ADDRESS:-reports@example.com}
       LIBRAVATAR_DEFAULT_IMAGE: ${LIBRAVATAR_DEFAULT_IMAGE:-identicon}
       VIDEO_BACKGROUNDS: >-
@@ -102,12 +102,12 @@ services:
     network_mode: host
     environment:
       RUST_LOG: ${RUST_LOG:-info}
-      OPENTALK_REC_AUTH__ISSUER: "https://${KC_HOSTNAME}/auth/realms/${KC_REALM_ID:-opentalk}"
+      OPENTALK_REC_AUTH__ISSUER: "https://${KC_HOSTNAME:-accounts.${OT_DOMAIN}}/auth/realms/${KC_REALM_ID:-opentalk}"
       OPENTALK_REC_AUTH__CLIENT_ID: "Recorder"
       OPENTALK_REC_AUTH__CLIENT_SECRET: ${KEYCLOAK_CLIENT_SECRET_RECORDER:-}
       OPENTALK_REC_RABBITMQ__URI: "amqp://rabbit/%2F"
       OPENTALK_REC_RABBITMQ__QUEUE: "opentalk_recorder"
-      OPENTALK_REC_CONTROLLER__DOMAIN: "${CONTROLLER_DOMAIN}" 
+      OPENTALK_REC_CONTROLLER__DOMAIN: "${CONTROLLER_DOMAIN:-controller.${OT_DOMAIN}}" 
     volumes:
       - ${RECORDER_CONFIG_FILE:-./config/recorder.toml}:/recorder/config.toml
 
@@ -182,7 +182,7 @@ services:
       KEYCLOAK_CLIENT_SECRET_OBELISK: ${KEYCLOAK_CLIENT_SECRET_OBELISK:-}
       KEYCLOAK_CLIENT_SECRET_RECORDER: ${KEYCLOAK_CLIENT_SECRET_RECORDER:-}
       KC_DOMAIN: ${OT_DOMAIN}
-      KC_HOSTNAME: "${KC_HOSTNAME}"
+      KC_HOSTNAME: "${KC_HOSTNAME:-accounts.${OT_DOMAIN}}"
       KC_HTTP_RELATIVE_PATH: ${KC_HTTP_RELATIVE_PATH:-/auth}
       KC_PROXY: ${KC_PROXY:-edge}
       KC_TESTUSER_ENABLE: ${KC_TESTUSER_ENABLE:-false}

env.sample

@@ -77,6 +77,7 @@ ETHERPAD_API_KEY="myetherpadapikey"
 # OPENTALK_CONTROLLER_IMAGE_TAG="v0.1"
 # OPENTALK_CONTROLLER_EXP_PORT="8090"
 # OPENTALK_CONTROLLER_CONFIG_FILE="./config/controller.toml"
+# CONTROLLER_DOMAIN="controller.$OT_DOMAIN"
 # KC_CLIENT_ID="OtBackend"
 # OPENTALK_CTRL_DATABASE__URL="postgres://postgres:password123@localhost:5432/opentalk"
 # OPENTALK_CTRL_DATABASE__MAX_CONNECTIONS="100"
@@ -149,7 +150,6 @@ OPENTALK_CTRL_KEYCLOAK__CLIENT_SECRET="$KEYCLOAK_CLIENT_SECRET_CONTROLLER"
 # OT_OBELISK_CONFIG_FILE="./config/obelisk.toml"
 # RUST_LOG: info
 # GST_DEBUG: 2
-# CONTROLLER_DOMAIN="controller.$OT_DOMAIN"
 # SIP_ADDR="0.0.0.0"
 # SIP_PORT="5060"
 # SIP_USER="mysipuser"