From 4181598210970e1610c5e4cc556b69b9e8548e9a Mon Sep 17 00:00:00 2001 From: Gitouche <26656-gitouche@users.noreply.framagit.org> Date: Sun, 6 Jun 2021 14:28:20 +0200 Subject: [PATCH] podman-jitsi : add support for URL and override by ENV variable --- podman-jitsi/05_freshinstall.sh | 2 +- podman-jitsi/10_install.sh | 2 +- podman-jitsi/vars.sh | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/podman-jitsi/05_freshinstall.sh b/podman-jitsi/05_freshinstall.sh index a8bc645..c408aac 100755 --- a/podman-jitsi/05_freshinstall.sh +++ b/podman-jitsi/05_freshinstall.sh @@ -25,4 +25,4 @@ sed_in_place "^ // remoteVideoMenu: {" " remoteVideoMenu: {\n disab # Patch ${confvolume}/web/interface_config.js sed_in_place "^ APP_NAME: 'Jitsi Meet'," " APP_NAME: 'Jitsi Garbaye'," ${confvolume}/web/interface_config.js sed_in_place "^ DEFAULT_REMOTE_DISPLAY_NAME: 'Fellow Jitster'," " DEFAULT_REMOTE_DISPLAY_NAME: 'Participant'," ${confvolume}/web/interface_config.js -sed_in_place "^ JITSI_WATERMARK_LINK: 'https://jitsi.org'," " JITSI_WATERMARK_LINK: 'https://jitsi.garbaye.fr'," ${confvolume}/web/interface_config.js +sed_in_place "^ JITSI_WATERMARK_LINK: 'https://jitsi.org'," " JITSI_WATERMARK_LINK: '${GARBAYE_JITSI_URL}'," ${confvolume}/web/interface_config.js diff --git a/podman-jitsi/10_install.sh b/podman-jitsi/10_install.sh index 214eca0..bc6b387 100755 --- a/podman-jitsi/10_install.sh +++ b/podman-jitsi/10_install.sh @@ -26,7 +26,7 @@ sed_in_place "^ - '\${HTTPS_PORT}:443'" "# - '\${HTTPS_POR sed_in_place "^HTTP_PORT=8000" "HTTP_PORT=8085" .env sed_in_place "^HTTPS_PORT=8443" "#HTTPS_PORT=8443" .env sed_in_place "^TZ=UTC" "TZ=Europe/Paris" .env -sed_in_place "^#PUBLIC_URL=https://meet.example.com" "PUBLIC_URL=https://jitsi.garbaye.fr" .env +sed_in_place "^#PUBLIC_URL=https://meet.example.com" "PUBLIC_URL=${GARBAYE_JITSI_URL}" .env sed_in_place "^#DOCKER_HOST_ADDRESS=192.168.1.1" "DOCKER_HOST_ADDRESS=192.168.128.10" .env sed_in_place "^#ENABLE_LETSENCRYPT=1" "ENABLE_LETSENCRYPT=0" .env sed_in_place "^#ENABLE_AUTH=1" "ENABLE_AUTH=0" .env diff --git a/podman-jitsi/vars.sh b/podman-jitsi/vars.sh index e10f7d9..68645ce 100644 --- a/podman-jitsi/vars.sh +++ b/podman-jitsi/vars.sh @@ -5,3 +5,4 @@ service_name="pod-${pod_name}.service" upstream_images="docker.io/jitsi/jvb docker.io/jitsi/jicofo docker.io/jitsi/prosody docker.io/jitsi/web" version='stable-5870' confvolume='~/.jitsi-meet-cfg' +GARBAYE_JITSI_URL="${GARBAYE_JITSI_ENV_URL:-https://jitsi.garbaye.fr}"