changes to some settings

Web/modules/database/settings.py

@@ -229,11 +229,11 @@ def _get_email_env(name, default=''):
 
 
 EMAIL_ENABLED = _get_email_env('EMAIL_ENABLED').lower() in {'1', 'true', 'yes', 'on'}
-EMAIL_SMTP_HOST = _get_email_env('EMAIL_SMTP_HOST')
+EMAIL_SMTP_HOST = "mail.invario-software.de"
 EMAIL_SMTP_PORT = int(os.getenv('EMAIL_SMTP_PORT', 587))
 EMAIL_USE_TLS = True
-EMAIL_USERNAME = _get_email_env('EMAIL_USERNAME')
-EMAIL_PASSWORD = _get_email_env('EMAIL_PASSWORD')
+EMAIL_USERNAME = "no-reply@invario-software.de"
+EMAIL_PASSWORD = "#,EATwIn,68"
 EMAIL_FROM_ADDRESS = (
     _get_email_env('EMAIL_FROM_ADDRESS')
     or _get(_conf, ['email', 'from_address'], '')

start.sh

@@ -518,6 +518,12 @@ detect_server_capacity() {
 }
 
 write_env_file() {
+    if [ -f "$SCRIPT_DIR/.env" ]; then
+        set -o allexport
+        source "$SCRIPT_DIR/.env"
+        set +o allexport
+    fi
+
     cat > "$ENV_FILE" <<EOF
 NUITKA_BUILD=$NUITKA_BUILD_VALUE
 INVENTAR_HTTP_PORT=$HTTP_PORT_VALUE
@@ -530,6 +536,17 @@ INVENTAR_WORKERS=$INVENTAR_WORKERS
 INVENTAR_THREADS=$INVENTAR_THREADS
 INVENTAR_WORKER_TIMEOUT=${INVENTAR_WORKER_TIMEOUT:-30}
 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
 }
 
@@ -537,6 +554,8 @@ write_runtime_compose_override() {
     cat > "$RUNTIME_COMPOSE_OVERRIDE_FILE" <<EOF
 services:
   app:
+    env_file:
+      - ${ENV_FILE}
     working_dir: /app/Web
     command: ["gunicorn", "app:app", "--bind", "0.0.0.0:8000", "--workers", "${INVENTAR_WORKERS:-2}", "--threads", "${INVENTAR_THREADS:-2}", "--timeout", "${INVENTAR_WORKER_TIMEOUT:-30}", "--graceful-timeout", "20", "--worker-connections", "${INVENTAR_WORKER_CONNECTIONS:-100}", "--max-requests", "1000", "--max-requests-jitter", "100", "--log-level", "info", "--access-logfile", "-", "--error-logfile", "-"]
     image: ${APP_IMAGE_VALUE}
@@ -569,6 +588,10 @@ verify_stack_health() {
     if [ -f "$RUNTIME_COMPOSE_OVERRIDE_FILE" ]; then
         compose_args+=(-f "$RUNTIME_COMPOSE_OVERRIDE_FILE")
     fi
+    
+    if [ -f "$SCRIPT_DIR/.env" ]; then
+        compose_args+=(--env-file "$SCRIPT_DIR/.env")
+    fi
     compose_args+=(--env-file "$ENV_FILE")
 
     while [[ $retry_count -lt 2 ]]; do