From dac35d517d15656cddcb64bd0fcd57916e4f65c4 Mon Sep 17 00:00:00 2001
From: Gitouche <26656-gitouche@users.noreply.framagit.org>
Date: Sat, 21 Oct 2023 14:09:29 +0200
Subject: [PATCH] Vaultwarden : variabiliser ip/port + CI+10000

---
 podman-vaultwarden/.gitlab-ci.yml        | 2 +-
 podman-vaultwarden/10_install.sh         | 2 ++
 podman-vaultwarden/container-compose.yml | 2 +-
 podman-vaultwarden/vars.sh               | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/podman-vaultwarden/.gitlab-ci.yml b/podman-vaultwarden/.gitlab-ci.yml
index 11ca4a7..144735c 100644
--- a/podman-vaultwarden/.gitlab-ci.yml
+++ b/podman-vaultwarden/.gitlab-ci.yml
@@ -11,7 +11,7 @@ vaultwarden:
   script:
     - cd podman-vaultwarden
     - ./ci_build-images.sh
-    - GARBAYE_VAULTWARDEN_DATABASE_PASSWORD=z1NnqbjdpBOreGdzHzmcDldL GARBAYE_VAULTWARDEN_ADMIN_PASSWORD='$argon2id$v=19$m=65540,t=3,p=4$TW5OdGJKY1JRbUZlYVVLZU9JSUNlM0U3UWUvY1J1ZUNrdVhkTDRmYjlPVT0$aFGMAuj4UwaXVF3QRGIDbo/g/Fh/BQOnsRI0FTooij4' ./05_freshinstall.sh
+    - GARBAYE_VAULTWARDEN_ENV_LISTENPORT=18090 GARBAYE_VAULTWARDEN_DATABASE_PASSWORD=z1NnqbjdpBOreGdzHzmcDldL GARBAYE_VAULTWARDEN_ADMIN_PASSWORD='$argon2id$v=19$m=65540,t=3,p=4$TW5OdGJKY1JRbUZlYVVLZU9JSUNlM0U3UWUvY1J1ZUNrdVhkTDRmYjlPVT0$aFGMAuj4UwaXVF3QRGIDbo/g/Fh/BQOnsRI0FTooij4' ./05_freshinstall.sh
     - ./20_enable.sh
     - ./30_start.sh && sleep 10
     - ./40_stop.sh
diff --git a/podman-vaultwarden/10_install.sh b/podman-vaultwarden/10_install.sh
index 6bf5688..38e7abe 100755
--- a/podman-vaultwarden/10_install.sh
+++ b/podman-vaultwarden/10_install.sh
@@ -46,6 +46,8 @@ export database_version
 export database_path
 export container_name
 export db_container_name
+export listen_if
+export listen_port
 
 if ! podman image exists ${service_image}:${service_version}; then
     podman image pull ${service_image}:${service_version} || exit 1
diff --git a/podman-vaultwarden/container-compose.yml b/podman-vaultwarden/container-compose.yml
index ec84166..8c7f4b0 100644
--- a/podman-vaultwarden/container-compose.yml
+++ b/podman-vaultwarden/container-compose.yml
@@ -18,7 +18,7 @@ services:
     volumes:
       - data:/data:Z
     ports:
-      - "127.0.0.1:8090:80"
+      - ${listen_if}:${listen_port}:80
     healthcheck:
       test: ["CMD", "/healthcheck.sh"]
       interval: 60s
diff --git a/podman-vaultwarden/vars.sh b/podman-vaultwarden/vars.sh
index b077341..21acf82 100644
--- a/podman-vaultwarden/vars.sh
+++ b/podman-vaultwarden/vars.sh
@@ -14,6 +14,8 @@ database_port=5432
 #database_port=3306
 ## default vars : override with ENV var
 GARBAYE_VAULTWARDEN_DOMAIN="${GARBAYE_VAULTWARDEN_ENV_DOMAIN:-http://localhost}"
+listen_if="${GARBAYE_VAULTWARDEN_ENV_LISTENIF:-127.0.0.1}"
+listen_port="${GARBAYE_VAULTWARDEN_ENV_LISTENPORT:-8090}"
 ## mandatory ENV vars
 envvars='GARBAYE_VAULTWARDEN_ADMIN_PASSWORD GARBAYE_VAULTWARDEN_DATABASE_PASSWORD'
 ## internal vars : do not touch