From c56f0dab27d612d3d02905289b86fdbff921df5d Mon Sep 17 00:00:00 2001
From: Gitouche <26656-gitouche@users.noreply.framagit.org>
Date: Sat, 3 Sep 2022 15:08:06 +0200
Subject: [PATCH] Jitsi : use service_name. Prep pour podman-compose 1.+

---
 podman-jitsi/10_install.sh | 12 ++++++------
 podman-jitsi/80_destroy.sh |  2 +-
 podman-jitsi/vars.sh       | 13 ++++++++-----
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/podman-jitsi/10_install.sh b/podman-jitsi/10_install.sh
index 9f929e6..ff53465 100755
--- a/podman-jitsi/10_install.sh
+++ b/podman-jitsi/10_install.sh
@@ -9,8 +9,8 @@ ensure_not_root
 
 ensure_pod_not_exists ${pod_name}
 
-if [[ -d ~/${confvolume} ]]; then
-    echo "Error : conf volume ~/${confvolume} already exists. Please consider running 80_destroy.sh."
+if [[ -d ${confvolume} ]]; then
+    echo "Error : conf volume ${confvolume} already exists. Please consider running 80_destroy.sh."
     exit 1
 fi
 
@@ -18,21 +18,21 @@ for image in ${upstream_images}; do
     podman image pull ${image}:${version} || exit 1
 done &&
 
-mkdir -p ~/${confvolume}/{web/letsencrypt,web/crontabs,transcripts,prosody/config,prosody/prosody-plugins-custom,jicofo,jvb,jigasi,jibri}
+mkdir -p ${confvolume}/{web/letsencrypt,web/crontabs,transcripts,prosody/config,prosody/prosody-plugins-custom,jicofo,jvb,jigasi,jibri}
 
 # Patch config.js
 echo "
 config.enableInsecureRoomNameWarning = true;
 
 config.disableThirdPartyRequests = true;
-" > ~/${confvolume}/web/custom-config.js
+" > ${confvolume}/web/custom-config.js
 
-# Patch ~/${confvolume}/web/interface_config.js
+# Patch ${confvolume}/web/interface_config.js
 echo "
 interfaceConfig.APP_NAME = 'Jitsi Garbaye';
 interfaceConfig.DEFAULT_REMOTE_DISPLAY_NAME = 'Participant';
 interfaceConfig.JITSI_WATERMARK_LINK = '${GARBAYE_JITSI_URL}';
-" > ~/${confvolume}/web/custom-interface_config.js
+" > ${confvolume}/web/custom-interface_config.js
 
 curl -s -- "https://codeload.github.com/jitsi/docker-jitsi-meet/tar.gz/refs/tags/${version}" | tar xzv --strip-components 1 docker-jitsi-meet-${version}/docker-compose.yml docker-jitsi-meet-${version}/env.example docker-jitsi-meet-${version}/gen-passwords.sh
 cp env.example .env
diff --git a/podman-jitsi/80_destroy.sh b/podman-jitsi/80_destroy.sh
index a329a71..9dfe678 100755
--- a/podman-jitsi/80_destroy.sh
+++ b/podman-jitsi/80_destroy.sh
@@ -7,4 +7,4 @@ source ${ABSDIR}/vars.sh
 # Run regular prune script for pods
 source ${ABSDIR}/../_podman-common/80_destroy_pod.sh &&
 # Remove configuration volume
-podman unshare rm -rf ~/${confvolume}/
+podman unshare rm -rf ${confvolume}/
diff --git a/podman-jitsi/vars.sh b/podman-jitsi/vars.sh
index 0ff954f..5bf927c 100644
--- a/podman-jitsi/vars.sh
+++ b/podman-jitsi/vars.sh
@@ -1,11 +1,14 @@
 #!/usr/bin/env bash
-
-pod_name='podman-jitsi'
-service_name="pod-${pod_name}.service"
-upstream_images="git.garbaye.fr/garbaye/jitsi-jvb git.garbaye.fr/garbaye/jitsi-jicofo git.garbaye.fr/garbaye/jitsi-prosody git.garbaye.fr/garbaye/jitsi-web"
+## vars
 version='stable-7648-4'
-confvolume='.jitsi-meet-cfg'
+## 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}"
+## internal vars : do not touch
+project_name=${PWD##*/}
+pod_name="${project_name}"
+service_name="pod-${pod_name}.service"
 get_default_iface_ipv4 GARBAYE_JITSI_PRIV_IP
+upstream_images="git.garbaye.fr/garbaye/jitsi-jvb git.garbaye.fr/garbaye/jitsi-jicofo git.garbaye.fr/garbaye/jitsi-prosody git.garbaye.fr/garbaye/jitsi-web"
+confvolume='~/.jitsi-meet-cfg'