From f3c67a94ee38eb9beb05722b9de65e4fae9b269e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20N=C3=A9grier?= Date: Tue, 9 Mar 2021 09:12:55 +0100 Subject: [PATCH] Trying to enable back connection on admin from develop, knowing that the develop certificate is broken. Fixing priority. --- deeployer.libsonnet | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/deeployer.libsonnet b/deeployer.libsonnet index b9df3294..07f5f491 100644 --- a/deeployer.libsonnet +++ b/deeployer.libsonnet @@ -23,9 +23,9 @@ "JITSI_URL": env.JITSI_URL, "SECRET_JITSI_KEY": env.SECRET_JITSI_KEY, "TURN_STATIC_AUTH_SECRET": env.TURN_STATIC_AUTH_SECRET, - } + if adminUrl != null then { + } + (if adminUrl != null then { "ADMIN_API_URL": adminUrl, - } else {} + if namespace != "master" then { + } else {}) + if namespace != "master" then { // Absolutely ugly WorkAround to circumvent broken certificates on the K8S test cluster. Don't do this in production kids! "NODE_TLS_REJECT_UNAUTHORIZED": "0" } @@ -45,9 +45,9 @@ "JITSI_URL": env.JITSI_URL, "SECRET_JITSI_KEY": env.SECRET_JITSI_KEY, "TURN_STATIC_AUTH_SECRET": env.TURN_STATIC_AUTH_SECRET, - } + if adminUrl != null then { + } + (if adminUrl != null then { "ADMIN_API_URL": adminUrl, - } else {} + if namespace != "master" then { + } else {}) + if namespace != "master" then { // Absolutely ugly WorkAround to circumvent broken certificates on the K8S test cluster. Don't do this in production kids! "NODE_TLS_REJECT_UNAUTHORIZED": "0" } @@ -67,9 +67,9 @@ "JITSI_URL": env.JITSI_URL, "API_URL": "back1:50051,back2:50051", "SECRET_JITSI_KEY": env.SECRET_JITSI_KEY, - } + if adminUrl != null then { + } + (if adminUrl != null then { "ADMIN_API_URL": adminUrl, - } else {} + if namespace != "master" then { + } else {}) + if namespace != "master" then { // Absolutely ugly WorkAround to circumvent broken certificates on the K8S test cluster. Don't do this in production kids! "NODE_TLS_REJECT_UNAUTHORIZED": "0" }