From 24304bf355a21fa5a92bd1aaddeb7cc305b7b630 Mon Sep 17 00:00:00 2001
From: KsmoinO <99479-KsmoinO@users.noreply.framagit.org>
Date: Sat, 5 Nov 2022 17:27:48 +0100
Subject: [PATCH] Migration jitsi podman 4.1

---
 podman-jitsi/10_install.sh | 4 ++--
 podman-jitsi/vars.sh       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/podman-jitsi/10_install.sh b/podman-jitsi/10_install.sh
index eba5b47..27f5d0d 100755
--- a/podman-jitsi/10_install.sh
+++ b/podman-jitsi/10_install.sh
@@ -63,9 +63,9 @@ 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 --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=podman-jitsi_infra --share=" --podman-run-args "--requires=podman-jitsi_infra --env-file .env" up -d &&
+podman-compose --pod-args "--infra=true --infra-name=podman-jitsi_infra --share=" --podman-run-args "--requires=podman-jitsi_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.$' &&
diff --git a/podman-jitsi/vars.sh b/podman-jitsi/vars.sh
index 804e251..da18359 100644
--- a/podman-jitsi/vars.sh
+++ b/podman-jitsi/vars.sh
@@ -8,10 +8,10 @@ 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}"
+#pod_name="${project_name}"
 # podman-compose 1.0.4 (devel) + podman 4.1+
-# pod_name='pod_podman-jitsi'
-service_name="pod-${pod_name}.service"
+pod_name="pod_${project_name}"
+service_name="${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="${HOME}/.jitsi-meet-cfg"