From aaa10926150b720826696a4b3f0b5e294c5a8351 Mon Sep 17 00:00:00 2001 From: fanyx Date: Sun, 26 Jun 2022 19:37:19 +0200 Subject: [PATCH] Set defaults for some environment variables --- tmserver/bin/eval_env.sh | 8 ++++---- xaseco/bin/eval_env.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tmserver/bin/eval_env.sh b/tmserver/bin/eval_env.sh index f850901..21e5a5d 100755 --- a/tmserver/bin/eval_env.sh +++ b/tmserver/bin/eval_env.sh @@ -4,16 +4,16 @@ config=( ) playlist=( ) # Mandatory -SERVER_SA_PASSWORD=${SERVER_SA_PASSWORD:?ERROR | SuperAdminPassword needs to be set. Generate with pwgen if needed.} && \ - config+=( "SERVER_SA_PASSWORD" ) -SERVER_ADM_PASSWORD=${SERVER_ADM_PASSWORD:?ERROR | AdminPassword needs to be set. Generate with pwgen if needed.} && \ - config+=( "SERVER_ADM_PASSWORD" ) SERVER_LOGIN=${SERVER_LOGIN?:ERROR | ServerLogin is missing. Server cannot start.} && \ config+=( "SERVER_LOGIN" ) SERVER_LOGIN_PASSWORD=${SERVER_LOGIN_PASSWORD?:ERROR | ServerLoginPassword is missing. Server cannot start.} && \ config+=( "SERVER_LOGIN_PASSWORD" ) # Optional +SERVER_SA_PASSWORD=${SERVER_SA_PASSWORD:-$(pwgen -s 24 1)} && config+=( "SERVER_SA_PASSWORD" ) +echo "INFO | SERVER_SA_PASSWORD: ${SERVER_SA_PASSWORD}" +SERVER_ADM_PASSWORD=${SERVER_ADM_PASSWORD:-$(pwgen -s 24 1)} && config+=( "SERVER_ADM_PASSWORD" ) +echo "INFO | SERVER_ADM_PASSWORD: ${SERVER_ADM_PASSWORD}" SERVER_PORT=${SERVER_PORT:-2350} && config+=( "SERVER_PORT" ) echo "INFO | SERVER_PORT: ${SERVER_PORT}" SERVER_P2P_PORT=${SERVER_P2P_PORT:-3450} && config+=( "SERVER_P2P_PORT" ) diff --git a/xaseco/bin/eval_env.sh b/xaseco/bin/eval_env.sh index febcb3c..5790331 100755 --- a/xaseco/bin/eval_env.sh +++ b/xaseco/bin/eval_env.sh @@ -21,7 +21,7 @@ echo "INFO | TMSERVER_PORT: ${TMSERVER_PORT}" MYSQL_HOST=${MYSQL_HOST:-db} && \ database+=( "MYSQL_HOST" ) echo "INFO | MYSQL_HOST: ${MYSQL_HOST}" -MYSQL_LOGIN=${MYSQL_LOGIN:?ERROR | MySQL username was not given...} && \ +MYSQL_LOGIN=${MYSQL_LOGIN:?-trackmani} && \ database+=( "MYSQL_LOGIN" ) echo "INFO | MYSQL_LOGIN: ${MYSQL_LOGIN}" MYSQL_PASSWORD=${MYSQL_PASSWORD:?ERROR | MySQL password was not given...} && \