From 76706acd0ed42854cceae51add93cba1bec621a8 Mon Sep 17 00:00:00 2001 From: Gitouche <26656-gitouche@users.noreply.framagit.org> Date: Fri, 10 Feb 2023 16:23:27 +0100 Subject: [PATCH] =?UTF-8?q?Framadate=20:=20suppression=20variables=20propr?= =?UTF-8?q?es=20=C3=A0=20la=20qualif=20et/ou=20mauvais=20defaults=20(Garba?= =?UTF-8?q?ye)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- podman-framadate/.gitlab-ci.yml | 2 +- podman-framadate/vars.sh | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/podman-framadate/.gitlab-ci.yml b/podman-framadate/.gitlab-ci.yml index 8cab5e9..11482db 100644 --- a/podman-framadate/.gitlab-ci.yml +++ b/podman-framadate/.gitlab-ci.yml @@ -10,7 +10,7 @@ framadate: script: - cd podman-framadate - ./ci_build_images.sh - - GARBAYE_FRAMADATE_ADMIN_PASSWORD=adlkjsqghen GARBAYE_FRAMADATE_MYSQL_ROOT_PASSWORD=zekjsljgnrxx GARBAYE_FRAMADATE_MYSQL_PASSWORD=azekljqlkcsdql GARBAYE_FRAMADATE_ENV_LISTENPORT=18087 ./05_freshinstall.sh + - GARBAYE_FRAMADATE_DOMAIN=sondage.garbaye.fr GARBAYE_FRAMADATE_ADMIN_MAIL=contact-framadate@garbaye.fr GARBAYE_FRAMADATE_ADMIN_PASSWORD=adlkjsqghen GARBAYE_FRAMADATE_MYSQL_ROOT_PASSWORD=zekjsljgnrxx GARBAYE_FRAMADATE_MYSQL_PASSWORD=azekljqlkcsdql GARBAYE_FRAMADATE_ENV_LISTENPORT=18087 ./05_freshinstall.sh - ./20_enable.sh - ./30_start.sh && sleep 10 - ./40_stop.sh diff --git a/podman-framadate/vars.sh b/podman-framadate/vars.sh index a2862c3..2c2ecf3 100644 --- a/podman-framadate/vars.sh +++ b/podman-framadate/vars.sh @@ -5,11 +5,9 @@ framadate_version='1.1.19' ## 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}" +GARBAYE_FRAMADATE_APP_NAME="${GARBAYE_FRAMADATE_ENV_APP_NAME:-Framadate}" ## mandatory ENV vars -envvars='GARBAYE_FRAMADATE_ADMIN_PASSWORD GARBAYE_FRAMADATE_MYSQL_ROOT_PASSWORD GARBAYE_FRAMADATE_MYSQL_PASSWORD' +envvars='GARBAYE_FRAMADATE_DOMAIN GARBAYE_FRAMADATE_ADMIN_MAIL GARBAYE_FRAMADATE_ADMIN_PASSWORD GARBAYE_FRAMADATE_MYSQL_ROOT_PASSWORD GARBAYE_FRAMADATE_MYSQL_PASSWORD' ## internal vars : do not touch project_name=${PWD##*/} pod_name="pod_${project_name}"