From 806a6b0362a3ddf64d3db40268c125ad48bb4da3 Mon Sep 17 00:00:00 2001 From: Gitouche <26656-gitouche@users.noreply.framagit.org> Date: Fri, 10 Feb 2023 16:37:14 +0100 Subject: [PATCH] =?UTF-8?q?Gitea=20:=20suppression=20variables=20propres?= =?UTF-8?q?=20=C3=A0=20la=20qualif=20et/ou=20mauvais=20defaults=20(Garbaye?= =?UTF-8?q?)=20-=202/2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- podman-gitea/.gitlab-ci.yml | 2 +- podman-gitea/vars.sh | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/podman-gitea/.gitlab-ci.yml b/podman-gitea/.gitlab-ci.yml index 9d45829..25c078a 100644 --- a/podman-gitea/.gitlab-ci.yml +++ b/podman-gitea/.gitlab-ci.yml @@ -11,7 +11,7 @@ gitea: script: - cd podman-gitea - ./ci_build-images.sh - - GARBAYE_GITEA_DOMAIN=git.garbaye.fr GARBAYE_GITEA_POSTGRES_PASSWORD=kejfczEAKjzkejklc GARBAYE_GITEA_ENV_WEBLISTENPORT=18088 GARBAYE_GITEA_ENV_SSHLISTENPORT=12222 ./05_freshinstall.sh + - GARBAYE_GITEA_DOMAIN=git.garbaye.fr GARBAYE_GITEA_SMTP_FROM='git-ci@garbaye.fr' GARBAYE_GITEA_POSTGRES_PASSWORD=kejfczEAKjzkejklc GARBAYE_GITEA_ENV_WEBLISTENPORT=18088 GARBAYE_GITEA_ENV_SSHLISTENPORT=12222 ./05_freshinstall.sh - ./20_enable.sh - ./30_start.sh && sleep 10 - ./40_stop.sh diff --git a/podman-gitea/vars.sh b/podman-gitea/vars.sh index 50dd90d..f67c11a 100644 --- a/podman-gitea/vars.sh +++ b/podman-gitea/vars.sh @@ -9,10 +9,9 @@ weblisten_if="${GARBAYE_GITEA_ENV_WEBLISTENIF:-127.0.0.1}" weblisten_port="${GARBAYE_GITEA_ENV_WEBLISTENPORT:-8088}" sshlisten_if="${GARBAYE_GITEA_ENV_SSHLISTENIF:-0.0.0.0}" sshlisten_port="${GARBAYE_GITEA_ENV_SSHLISTENPORT:-2222}" -GARBAYE_GITEA_APPNAME="${GARBAYE_GITEA_ENV_APPNAME:-La forge Garbaye}" -GARBAYE_GITEA_SMTP_FROM="${GARBAYE_GITEA_ENV_SMTP_FROM:-git@garbaye.fr}" +GARBAYE_GITEA_APPNAME="${GARBAYE_GITEA_ENV_APPNAME:-Gitea}" ## mandatory ENV vars -envvars='GARBAYE_GITEA_DOMAIN GARBAYE_GITEA_POSTGRES_PASSWORD' +envvars='GARBAYE_GITEA_DOMAIN GARBAYE_GITEA_POSTGRES_PASSWORD GARBAYE_GITEA_SMTP_FROM' ## internal vars : do not touch project_name=${PWD##*/} pod_name="${project_name}"