revert 92c86334e9

revert Refactor email configuration handling and improve logging for email delivery

.github/workflows/release-docker.yml

@@ -230,106 +230,97 @@ jobs:
           tags: |
             ${{ steps.meta.outputs.image }}
 
-      - name: Create release-only docker bundle 
-        run: | 
-             mkdir -p release-bundle 
-
-             # 1. .env Datei aus Gitea Secrets erzeugen
-             cat > release-bundle/.env <<EOF
-             INVENTAR_SECRET_KEY=${{ secrets.INVENTAR_SECRET_KEY }}
-             INVENTAR_DATA_ENCRYPTION_KEY=${{ secrets.INVENTAR_DATA_ENCRYPTION_KEY }}
-             INVENTAR_MONGODB_PASSWORD=${{ secrets.INVENTAR_MONGODB_PASSWORD }}
-             EMAIL_ENABLED=${{ secrets.EMAIL_ENABLED }}
-             EMAIL_SMTP_HOST=${{ secrets.EMAIL_SMTP_HOST }}
-             EMAIL_SMTP_PORT=${{ secrets.EMAIL_SMTP_PORT }}
-             EMAIL_USERNAME=${{ secrets.EMAIL_USERNAME }}
-             EMAIL_PASSWORD=${{ secrets.EMAIL_PASSWORD }}
-             EMAIL_FROM_ADDRESS=${{ secrets.EMAIL_FROM_ADDRESS }}
-             EOF
-
-             # 2. docker-compose.yml nutzt env_file
-             cat > release-bundle/docker-compose.yml <<EOF 
-             services: 
-               app: 
-                 image: \${INVENTAR_APP_IMAGE:-${{ steps.meta.outputs.image }}} 
-                 container_name: inventarsystem-app 
-                 restart: unless-stopped 
-                 env_file:
-                   - .env
-                 ports: 
-                   - "\${INVENTAR_HTTP_PORT:-10000}:8000" 
-                 depends_on: 
-                   - mongodb 
-                   - redis 
-                 environment: 
-                   INVENTAR_MONGODB_HOST: mongodb 
-                   INVENTAR_MONGODB_PORT: "27017" 
-                   INVENTAR_MONGODB_DB: Inventarsystem 
-                   INVENTAR_BACKUP_FOLDER: /data/backups 
-                   INVENTAR_LOGS_FOLDER: /data/logs 
-                 expose: 
-                   - "8000" 
-                 volumes: 
-                   - ./config.json:/app/config.json:ro 
-                   - app_uploads:/app/Web/uploads 
-                   - app_thumbnails:/app/Web/thumbnails 
-                   - app_previews:/app/Web/previews 
-                   - app_qrcodes:/app/Web/QRCodes 
-                   - app_backups:/data/backups 
-                   - app_logs:/data/logs 
-              
-               mongodb: 
-                 image: mongo:7.0 
-                 container_name: inventarsystem-mongodb 
-                 restart: unless-stopped 
-                 volumes: 
-                   - mongodb_data:/data/db 
-                 healthcheck: 
-                   test: ["CMD", "mongosh", "--quiet", "--eval", "db.adminCommand('ping').ok"] 
-                   interval: 10s 
-                   timeout: 5s 
-                   retries: 10 
-              
-               redis: 
-                 image: redis:7-alpine 
-                 container_name: inventarsystem-redis 
-                 restart: unless-stopped 
-                 command: redis-server --appendonly yes --maxmemory 512mb --maxmemory-policy allkeys-lru 
-                 ports: 
-                   - "6379:6379" 
-                 volumes: 
-                   - redis_data:/data 
-                 healthcheck: 
-                   test: ["CMD", "redis-cli", "ping"] 
-                   interval: 10s 
-                   timeout: 5s 
-                   retries: 5 
-              
-             volumes: 
-               mongodb_data: 
-               app_uploads: 
-               app_thumbnails: 
-               app_previews: 
-               app_qrcodes: 
-               app_backups: 
-               app_logs: 
-               redis_data: 
-             EOF 
-              
-             for f in start.sh stop.sh restart.sh backup.sh restore.sh config.json update.sh; do 
-               if [ -f "$f" ]; then 
-                 cp "$f" "release-bundle/$(basename "$f")" 
-               fi 
-             done 
-              
-             for f in docker-compose-multitenant.yml manage-tenant.sh run-tenant-cmd.sh MULTITENANT_DEPLOYMENT.md MULTITENANT_PYTHON_API.md; do 
-               if [ -f "$f" ]; then 
-                 cp "$f" "release-bundle/$(basename "$f")" 
-               fi 
-             done 
-              
-             find release-bundle -maxdepth 1 -type f -name '*.sh' -exec chmod +x {} \; || true 
-             tar -czf inventarsystem-docker-bundle.tar.gz -C release-bundle .
+      - name: Create release-only docker bundle
+        run: |
+            mkdir -p release-bundle
+            cat > release-bundle/docker-compose.yml <<EOF
+            services:
+              app:
+                image: \${INVENTAR_APP_IMAGE:-${{ steps.meta.outputs.image }}}
+                container_name: inventarsystem-app
+                restart: unless-stopped
+                ports:
+                  - "\${INVENTAR_HTTP_PORT:-10000}:8000"
+                depends_on:
+                  - mongodb
+                  - redis
+                environment:
+                  INVENTAR_MONGODB_HOST: mongodb
+                  INVENTAR_MONGODB_PORT: "27017"
+                  INVENTAR_MONGODB_DB: Inventarsystem
+                  INVENTAR_BACKUP_FOLDER: /data/backups
+                  INVENTAR_LOGS_FOLDER: /data/logs
+                  INVENTAR_SECRET_KEY: ${{secrets.INVENTAR_SECRET_KEY}}
+                  INVENTAR_DATA_ENCRYPTION_KEY: ${{secrets.INVENTAR_DATA_ENCRYPTION_KEY}}
+                  INVENTAR_MONGODB_PASSWORD: ${{secrets.INVENTAR_MONGODB_PASSWORD}}
+                  EMAIL_ENABLED: ${{secrets.EMAIL_ENABLED}}
+                  EMAIL_SMTP_HOST: ${{secrets.EMAIL_SMTP_HOST}}
+                  EMAIL_SMTP_PORT: ${{secrets.EMAIL_SMTP_PORT}}
+                  EMAIL_USERNAME: ${{secrets.EMAIL_USERNAME}}
+                  EMAIL_PASSWORD: ${{secrets.EMAIL_PASSWORD}}
+                expose:
+                  - "8000"
+                volumes:
+                  - ./config.json:/app/config.json:ro
+                  - app_uploads:/app/Web/uploads
+                  - app_thumbnails:/app/Web/thumbnails
+                  - app_previews:/app/Web/previews
+                  - app_qrcodes:/app/Web/QRCodes
+                  - app_backups:/data/backups
+                  - app_logs:/data/logs
+            
+              mongodb:
+                image: mongo:7.0
+                container_name: inventarsystem-mongodb
+                restart: unless-stopped
+                volumes:
+                  - mongodb_data:/data/db
+                healthcheck:
+                  test: ["CMD", "mongosh", "--quiet", "--eval", "db.adminCommand('ping').ok"]
+                  interval: 10s
+                  timeout: 5s
+                  retries: 10
+            
+              redis:
+                image: redis:7-alpine
+                container_name: inventarsystem-redis
+                restart: unless-stopped
+                command: redis-server --appendonly yes --maxmemory 512mb --maxmemory-policy allkeys-lru
+                ports:
+                  - "6379:6379"
+                volumes:
+                  - redis_data:/data
+                healthcheck:
+                  test: ["CMD", "redis-cli", "ping"]
+                  interval: 10s
+                  timeout: 5s
+                  retries: 5
+            
+            volumes:
+              mongodb_data:
+              app_uploads:
+              app_thumbnails:
+              app_previews:
+              app_qrcodes:
+              app_backups:
+              app_logs:
+              redis_data:
+            EOF
+            
+            for f in start.sh stop.sh restart.sh backup.sh restore.sh config.json update.sh; do
+              if [ -f "$f" ]; then
+                cp "$f" "release-bundle/$(basename "$f")"
+              fi
+            done
+            
+            for f in docker-compose-multitenant.yml manage-tenant.sh run-tenant-cmd.sh MULTITENANT_DEPLOYMENT.md MULTITENANT_PYTHON_API.md; do
+              if [ -f "$f" ]; then
+                cp "$f" "release-bundle/$(basename "$f")"
+              fi
+            done
+            
+            find release-bundle -maxdepth 1 -type f -name '*.sh' -exec chmod +x {} \; || true
+            tar -czf inventarsystem-docker-bundle.tar.gz -C release-bundle .
 
       - name: Create or update Gitea Release
         uses: https://gitea.com/actions/gitea-release-action@v1

Web/modules/database/settings.py

@@ -220,25 +220,13 @@ SSL_CERT = _get(_conf, ['ssl', 'cert'], DEFAULTS['ssl']['cert'])
 SSL_KEY = _get(_conf, ['ssl', 'key'], DEFAULTS['ssl']['key'])
 
 # Email settings
-def _get_email_env(name, default=''):
-    value = os.getenv(name)
-    if value is None:
-        return default
-    value = value.strip()
-    return '' if value.lower() in {'', 'false', 'none', 'null'} else value
-
-
-EMAIL_ENABLED = _get_email_env('EMAIL_ENABLED').lower() in {'1', 'true', 'yes', 'on'}
-EMAIL_SMTP_HOST = _get_email_env('EMAIL_SMTP_HOST')
+EMAIL_ENABLED = bool(os.getenv('EMAIL_ENABLED', False))
+EMAIL_SMTP_HOST = str(os.getenv('EMAIL_SMTP_HOST', False))
 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_FROM_ADDRESS = (
-    _get_email_env('EMAIL_FROM_ADDRESS')
-    or _get(_conf, ['email', 'from_address'], '')
-    or EMAIL_USERNAME
-)
+EMAIL_USERNAME = str(os.getenv('EMAIL_USERNAME', False))
+EMAIL_PASSWORD = str(os.getenv('EMAIL_PASSWORD', False))
+EMAIL_FROM_ADDRESS = _get(_conf, ['email', 'from_address'], EMAIL_USERNAME)
 EMAIL_DEFAULT_SENDER_NAME = "Invario Inventarsystem Sender"
 EMAIL_TIMEOUT_SECONDS = 20
 

Web/modules/emailservice/email.py

@@ -3,18 +3,11 @@ from email.mime.text import MIMEText
 from email.mime.application import MIMEApplication
 import smtplib
 import time
-import logging
 
 import Web.modules.database.settings as cfg
 
 
-logger = logging.getLogger(__name__)
-
-
 def _build_smtp_client():
-    if not cfg.EMAIL_SMTP_HOST:
-        raise RuntimeError('EMAIL_SMTP_HOST ist nicht konfiguriert')
-
     smtp = smtplib.SMTP(
         cfg.EMAIL_SMTP_HOST,
         cfg.EMAIL_SMTP_PORT,
@@ -38,12 +31,11 @@ def _normalize_recipients(email: list | str) -> list[str]:
 def _send_message(email: list | str, subject: str, note: str, sender: str, attachment=None) -> bool:
     """Send a plain/HTML message, optionally with one PDF attachment."""
     if not cfg.MODULES.is_enabled("mail"):
-        logger.info("Email delivery skipped because the mail module is disabled")
+        print("Debug: Module not enabled")
         return False
 
     recipients = _normalize_recipients(email)
     if not recipients:
-        logger.warning("Email delivery skipped because no recipients were provided")
         return False
 
     body_message = note
@@ -112,7 +104,7 @@ def _send_message(email: list | str, subject: str, note: str, sender: str, attac
 
         return True
     except Exception as e:
-        logger.exception("Email delivery failed: %s", e)
+        print(f"Debug: Fehler beim Senden der E-Mail: {e}")
         return False
     finally:
         if smtp:

start.sh

@@ -518,12 +518,6 @@ 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
@@ -536,17 +530,6 @@ 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
 }
 
@@ -586,10 +569,6 @@ 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