revert changes to the env processing
This commit is contained in:
2026-09-16 15:35:36 +00:00
parent 210483d250
commit 612ce2e6e6
-21
View File
@@ -518,12 +518,6 @@ detect_server_capacity() {
} }
write_env_file() { write_env_file() {
if [ -f "$SCRIPT_DIR/.env" ]; then
set -o allexport
source "$SCRIPT_DIR/.env"
set +o allexport
fi
cat > "$ENV_FILE" <<EOF cat > "$ENV_FILE" <<EOF
NUITKA_BUILD=$NUITKA_BUILD_VALUE NUITKA_BUILD=$NUITKA_BUILD_VALUE
INVENTAR_HTTP_PORT=$HTTP_PORT_VALUE INVENTAR_HTTP_PORT=$HTTP_PORT_VALUE
@@ -536,17 +530,6 @@ INVENTAR_WORKERS=$INVENTAR_WORKERS
INVENTAR_THREADS=$INVENTAR_THREADS INVENTAR_THREADS=$INVENTAR_THREADS
INVENTAR_WORKER_TIMEOUT=${INVENTAR_WORKER_TIMEOUT:-30} INVENTAR_WORKER_TIMEOUT=${INVENTAR_WORKER_TIMEOUT:-30}
INVENTAR_WORKER_CONNECTIONS=${INVENTAR_WORKER_CONNECTIONS:-100} INVENTAR_WORKER_CONNECTIONS=${INVENTAR_WORKER_CONNECTIONS:-100}
# Secrets & E-Mail Konfiguration weiterreichen
INVENTAR_SECRET_KEY=${INVENTAR_SECRET_KEY:-}
INVENTAR_DATA_ENCRYPTION_KEY=${INVENTAR_DATA_ENCRYPTION_KEY:-}
INVENTAR_MONGODB_PASSWORD=${INVENTAR_MONGODB_PASSWORD:-}
EMAIL_ENABLED=${EMAIL_ENABLED:-true}
EMAIL_SMTP_HOST=${EMAIL_SMTP_HOST:-}
EMAIL_SMTP_PORT=${EMAIL_SMTP_PORT:-587}
EMAIL_USERNAME=${EMAIL_USERNAME:-}
EMAIL_PASSWORD=${EMAIL_PASSWORD:-}
EMAIL_FROM_ADDRESS=${EMAIL_FROM_ADDRESS:-}
EOF EOF
} }
@@ -586,10 +569,6 @@ verify_stack_health() {
if [ -f "$RUNTIME_COMPOSE_OVERRIDE_FILE" ]; then if [ -f "$RUNTIME_COMPOSE_OVERRIDE_FILE" ]; then
compose_args+=(-f "$RUNTIME_COMPOSE_OVERRIDE_FILE") compose_args+=(-f "$RUNTIME_COMPOSE_OVERRIDE_FILE")
fi fi
if [ -f "$SCRIPT_DIR/.env" ]; then
compose_args+=(--env-file "$SCRIPT_DIR/.env")
fi
compose_args+=(--env-file "$ENV_FILE") compose_args+=(--env-file "$ENV_FILE")
while [[ $retry_count -lt 2 ]]; do while [[ $retry_count -lt 2 ]]; do