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

---
 podman-framadate/vars.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/podman-framadate/vars.sh b/podman-framadate/vars.sh
index c6ebf65..76cd45b 100644
--- a/podman-framadate/vars.sh
+++ b/podman-framadate/vars.sh
@@ -1,15 +1,19 @@
 #!/usr/bin/env bash
-
-pod_name='podman-framadate'
-service_name="pod-${pod_name}.service"
+## vars
 framadate_image='git.garbaye.fr/garbaye/framadate-app'
 framadate_version='1.1.19'
-dbvolume='podman-framadate_framadate-db'
+## default vars : override with ENV var
 listen_if="${GARBAYE_FRAMADATE_ENV_LISTENIF:-127.0.0.1}"
 listen_port="${GARBAYE_FRAMADATE_ENV_LISTENPORT:-8087}"
 GARBAYE_FRAMADATE_APP_NAME="${GARBAYE_FRAMADATE_ENV_APP_NAME:-Framadate Garbaye}"
 GARBAYE_FRAMADATE_DOMAIN="${GARBAYE_FRAMADATE_ENV_DOMAIN:-sondage.garbaye.fr}"
 GARBAYE_FRAMADATE_ADMIN_MAIL="${GARBAYE_FRAMADATE_ENV_ADMIN_MAIL:-contact-framadate@garbaye.fr}"
-get_default_iface_ipv4 GARBAYE_FRAMADATE_SMTP_SERVER
+## mandatory ENV vars
 envvars='GARBAYE_FRAMADATE_ADMIN_PASSWORD GARBAYE_FRAMADATE_MYSQL_ROOT_PASSWORD GARBAYE_FRAMADATE_MYSQL_PASSWORD'
+## internal vars : do not touch
+project_name=${PWD##*/}
+pod_name="${project_name}"
+service_name="pod-${pod_name}.service"
+get_default_iface_ipv4 GARBAYE_FRAMADATE_SMTP_SERVER
 upstream_images="${framadate_image} localhost/framadate-app docker.io/library/composer docker.io/library/mysql docker.io/library/php docker.io/library/composer"
+dbvolume='podman-framadate_framadate-db'