From 0bac5a81a914e890a60682e1e3c8d0a396dae712 Mon Sep 17 00:00:00 2001
From: Gitouche <26656-gitouche@users.noreply.framagit.org>
Date: Sun, 20 Nov 2022 11:00:37 +0100
Subject: [PATCH] podman-jitsi : nettoyage

---
 podman-jitsi/10_install.sh | 9 +++------
 podman-jitsi/vars.sh       | 3 ---
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/podman-jitsi/10_install.sh b/podman-jitsi/10_install.sh
index 981cbba..ca63cf4 100755
--- a/podman-jitsi/10_install.sh
+++ b/podman-jitsi/10_install.sh
@@ -64,15 +64,12 @@ echo "ENABLE_IPV6=0" >> .env
 export listen_if
 export listen_port
 
-# podman-compose 0.1.x + podman 4.0
-#podman-compose --podman-run-args "--env-file .env" up -d &&
-# podman-compose 1.0.4 (devel) + podman 4.1+
 podman-compose --pod-args "--infra=true --infra-name=${project_name}_infra --share=" --podman-run-args "--requires=${project_name}_infra --env-file .env" up -d &&
 
 # Wait for web to be up
-( podman logs --tail=3 -f podman-jitsi_web_1 2>&1 & ) | grep -q '^\[services.d\] done.$' &&
-podman cp assets/welcome-background.png podman-jitsi_web_1:/usr/share/jitsi-meet/images/welcome-background.png &&
-podman exec -t podman-jitsi_web_1 chmod 444 /usr/share/jitsi-meet/images/welcome-background.png &&
+( podman logs --tail=3 -f ${project_name}_web_1 2>&1 & ) | grep -q '^\[services.d\] done.$' &&
+podman cp assets/welcome-background.png ${project_name}_web_1:/usr/share/jitsi-meet/images/welcome-background.png &&
+podman exec -t ${project_name}_web_1 chmod 444 /usr/share/jitsi-meet/images/welcome-background.png &&
 podman pod stop ${pod_name} && echo Pod built and stopped.
 
 # cleanup
diff --git a/podman-jitsi/vars.sh b/podman-jitsi/vars.sh
index 66fe602..b135eed 100644
--- a/podman-jitsi/vars.sh
+++ b/podman-jitsi/vars.sh
@@ -7,9 +7,6 @@ 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##*/}
-# podman-compose 0.1.x + podman 4.0
-#pod_name="${project_name}"
-# podman-compose 1.0.4 (devel) + podman 4.1+
 pod_name="pod_${project_name}"
 service_name="pod-${pod_name}.service"
 get_default_iface_ipv4 GARBAYE_JITSI_PRIV_IP