From 955b320565faa072f284cf4156020ce5811979ad Mon Sep 17 00:00:00 2001
From: jwijenbergh <jeroenwijenbergh@protonmail.com>
Date: Fri, 25 Mar 2022 12:23:28 +0100
Subject: Set portal username and pass with env vars

---
 ci/docker/starteduvpn.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'ci/docker/starteduvpn.sh')

diff --git a/ci/docker/starteduvpn.sh b/ci/docker/starteduvpn.sh
index 191ef79..cddf88c 100644
--- a/ci/docker/starteduvpn.sh
+++ b/ci/docker/starteduvpn.sh
@@ -1,5 +1,15 @@
 #!/usr/bin/env bash
 
+if [[ -z "${PORTAL_USER}" ]]; then
+    printf "Error: No portal username set, set the PORTAL_USER env var\n"
+    exit 1
+fi
+
+if [[ -z "${PORTAL_PASS}" ]]; then
+    printf "Error: No portal username set, set the PORTAL_PASS env var\n"
+    exit 1
+fi
+
 systemctl start php-fpm
 systemctl start httpd
 systemctl start crond
@@ -9,9 +19,6 @@ sleep 5
 
 vpn-maint-apply-changes
 
-USER_NAME="docker"
-USER_PASS="docker"
-
-sudo -u apache vpn-user-portal-account --add "${USER_NAME}" --password "${USER_PASS}"
+sudo -u apache vpn-user-portal-account --add "${PORTAL_USER}" --password "${PORTAL_PASS}"
 
 sleep infinity
-- 
cgit v1.2.3