From 63452dee544858ed820df10130cb4efc72f4f911 Mon Sep 17 00:00:00 2001 From: Gitouche <26656-gitouche@users.noreply.framagit.org> Date: Fri, 10 Feb 2023 16:04:40 +0100 Subject: [PATCH] =?UTF-8?q?Seafile=20:=20suppression=20variables=20propres?= =?UTF-8?q?=20=C3=A0=20la=20qualif=20et/ou=20mauvais=20defaults=20(Garbaye?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- podman-seafile/.gitlab-ci.yml | 2 +- podman-seafile/vars.sh | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/podman-seafile/.gitlab-ci.yml b/podman-seafile/.gitlab-ci.yml index c005f7e..db9868f 100644 --- a/podman-seafile/.gitlab-ci.yml +++ b/podman-seafile/.gitlab-ci.yml @@ -11,7 +11,7 @@ seafile: script: - cd podman-seafile - ./ci_build-images.sh - - GARBAYE_SEAFILE_MYSQL_ROOT_PASSWORD=ecruebdfklj GARBAYE_SEAFILE_ENV_LISTENPORT=18082 ./05_freshinstall.sh + - GARBAYE_SEAFILE_ADMIN_EMAIL=laposte-seafile-ci@garbaye.fr GARBAYE_SEAFILE_SERVER_HOSTNAME=seafile.garbaye.fr GARBAYE_SEAFILE_MYSQL_ROOT_PASSWORD=ecruebdfklj GARBAYE_SEAFILE_ENV_LISTENPORT=18082 ./05_freshinstall.sh - ./20_enable.sh - ./30_start.sh && sleep 10 - ./40_stop.sh diff --git a/podman-seafile/vars.sh b/podman-seafile/vars.sh index 079c6b0..009df58 100644 --- a/podman-seafile/vars.sh +++ b/podman-seafile/vars.sh @@ -7,11 +7,9 @@ seafile_release='9.0.10' ## default vars : override with ENV var listen_if="${GARBAYE_SEAFILE_ENV_LISTENIF:-127.0.0.1}" listen_port="${GARBAYE_SEAFILE_ENV_LISTENPORT:-8082}" -GARBAYE_SEAFILE_SERVER_HOSTNAME="${GARBAYE_SEAFILE_ENV_SERVER_HOSTNAME:-seafile.garbaye.fr}" GARBAYE_SEAFILE_ADMIN_PASSWORD="${GARBAYE_SEAFILE_ENV_ADMIN_PASSWORD:-asecret}" -GARBAYE_SEAFILE_ADMIN_EMAIL="${GARBAYE_SEAFILE_ENV_ADMIN_EMAIL:-laposte-seafile@garbaye.fr}" ## mandatory ENV vars -envvars='GARBAYE_SEAFILE_MYSQL_ROOT_PASSWORD' +envvars='GARBAYE_SEAFILE_ADMIN_EMAIL GARBAYE_SEAFILE_SERVER_HOSTNAME GARBAYE_SEAFILE_MYSQL_ROOT_PASSWORD' ## internal vars : do not touch project_name=${PWD##*/} pod_name="pod_${project_name}"