diff --git a/podman-matrix/.gitlab-ci.yml b/podman-matrix/.gitlab-ci.yml index f01fa0f..577ca61 100644 --- a/podman-matrix/.gitlab-ci.yml +++ b/podman-matrix/.gitlab-ci.yml @@ -14,7 +14,7 @@ matrix: script: - cd podman-matrix - ./ci_build-images.sh - - GARBAYE_MATRIX_POSTGRES_PASSWORD=WHATEVERCIDBPASSWORD GARBAYE_MATRIX_ENV_LISTENPORT=18086 ./05_freshinstall.sh + - GARBAYE_MATRIX_DOMAIN=matrix.garbaye.fr GARBAYE_MATRIX_URL=https://matrix.garbaye.fr GARBAYE_MATRIX_POSTGRES_PASSWORD=WHATEVERCIDBPASSWORD GARBAYE_MATRIX_ENV_LISTENPORT=18086 ./05_freshinstall.sh - ./20_enable.sh - ./30_start.sh && sleep 10 - ./40_stop.sh diff --git a/podman-matrix/vars.sh b/podman-matrix/vars.sh index 7d47959..72d8c4a 100644 --- a/podman-matrix/vars.sh +++ b/podman-matrix/vars.sh @@ -7,8 +7,6 @@ postgres_version='11-bullseye' ## default vars : override with ENV var listen_if="${GARBAYE_MATRIX_ENV_LISTENIF:-127.0.0.1}" listen_port="${GARBAYE_MATRIX_ENV_LISTENPORT:-8086}" -GARBAYE_MATRIX_DOMAIN="${GARBAYE_MATRIX_DOMAIN:-garbaye.fr}" -GARBAYE_MATRIX_URL="${GARBAYE_MATRIX_URL:-https://matrix.garbaye.fr}" ## mandatory ENV vars envvars='GARBAYE_MATRIX_POSTGRES_PASSWORD GARBAYE_MATRIX_DOMAIN GARBAYE_MATRIX_URL' ## internal vars : do not touch