From 258810f4dc70994833449c66e7fe9d175e876bf8 Mon Sep 17 00:00:00 2001 From: bucde Date: Tue, 28 Sep 2021 11:48:35 +0200 Subject: [PATCH] feat: add variable for public url --- docker-compose.yml | 2 +- setup | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8bc4d5e..5c34476 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,4 +15,4 @@ services: DB_BASE: ${KIMAI_DB_NAME:?err} DB_USER: ${KIMAI_DB_USER:?err} DB_PASS: ${KIMAI_DB_PASSWORD:?err} - TRUSTED_HOSTS: localhost,127.0.0.1,${KIMAI_HOST_IP_ADDRESS:-127.0.0.1} + TRUSTED_HOSTS: localhost,127.0.0.1,${KIMAI_HOST_IP_ADDRESS:-127.0.0.1},${KIMAI_PUBLIC_URL:?err} diff --git a/setup b/setup index f16be5d..3771a68 100755 --- a/setup +++ b/setup @@ -24,6 +24,7 @@ KIMAI_CONTAINER_NAME="${KIMAI_PROJECT_NAME}_core" KIMAI_VERSION="" KIMAI_HOST_IP_ADDRESS="" KIMAI_HOST_PORT="" +KIMAI_PUBLIC_URL="" KIMAI_SUPERADMIN_MAIL="" KIMAI_SUPERADMIN_PASSWORD="" KIMAI_DB_HOST="" @@ -56,6 +57,7 @@ if [ $CONFIG_EXISTS == "false" ] || [ $USE_EXISTING_CONFIG == "n" ]; then read -p "Enter kimai version which should be used: " KIMAI_VERSION read -p "Enter host (vm) ip address on which kimai should be accessible: " KIMAI_HOST_IP_ADDRESS read -p "Enter host (vm) port on which kimai should be accessible: " KIMAI_HOST_PORT + read -p "Enter public url on which kimai should be accessible: " KIMAI_PUBLIC_URL read -p "Enter superadmin mail address for kimai: " KIMAI_SUPERADMIN_MAIL read -p "Enter superadmin password for kimai: " KIMAI_SUPERADMIN_PASSWORD read -p "Enter database host for kimai: " KIMAI_DB_HOST