From 054825de483c7c492cb31ba3fbf98789f6120002 Mon Sep 17 00:00:00 2001 From: Gitouche <26656-gitouche@users.noreply.framagit.org> Date: Fri, 10 Feb 2023 16:46:10 +0100 Subject: [PATCH] =?UTF-8?q?Jitsi=20:=20suppression=20variables=20propres?= =?UTF-8?q?=20=C3=A0=20la=20qualif=20et/ou=20mauvais=20defaults=20(Garbaye?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- podman-jitsi/.gitlab-ci.yml | 4 ++-- podman-jitsi/vars.sh | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/podman-jitsi/.gitlab-ci.yml b/podman-jitsi/.gitlab-ci.yml index 3e055ca..3b1d286 100644 --- a/podman-jitsi/.gitlab-ci.yml +++ b/podman-jitsi/.gitlab-ci.yml @@ -10,12 +10,12 @@ jitsi: script: - cd podman-jitsi - ./ci_build-images.sh - - GARBAYE_JITSI_ENV_LISTENPORT=18085 ./10_install.sh + - GARBAYE_JITSI_URL=https://jitsi.garbaye.fr GARBAYE_JITSI_ENV_LISTENPORT=18085 ./10_install.sh - ./20_enable.sh - ./30_start.sh && sleep 10 - ./40_stop.sh - ./30_start.sh && sleep 10 - - GARBAYE_JITSI_ENV_LISTENPORT=18085 ./50_update.sh + - GARBAYE_JITSI_URL=https://jitsi.garbaye.fr GARBAYE_JITSI_ENV_LISTENPORT=18085 ./50_update.sh - ./40_stop.sh - ./70_disable.sh - ./80_destroy.sh diff --git a/podman-jitsi/vars.sh b/podman-jitsi/vars.sh index 29a5db5..73c2317 100644 --- a/podman-jitsi/vars.sh +++ b/podman-jitsi/vars.sh @@ -4,7 +4,8 @@ version='stable-8252' ## default vars : override with ENV var listen_if="${GARBAYE_JITSI_ENV_LISTENIF:-127.0.0.1}" listen_port="${GARBAYE_JITSI_ENV_LISTENPORT:-8085}" -GARBAYE_JITSI_URL="${GARBAYE_JITSI_ENV_URL:-https://jitsi.garbaye.fr}" +## mandatory ENV vars +envvars='GARBAYE_JITSI_URL' ## internal vars : do not touch project_name=${PWD##*/} pod_name="pod_${project_name}"