backup

2026-05-10 08:48:42 +02:00
parent cc9d3220c9
commit 79df1aa493
15 changed files with 3523 additions and 892 deletions
--- a/Docker/compose.debug.yml
+++ b/Docker/compose.debug.yml
@@ -34,7 +34,7 @@ services:
      - ../data/fail2ban-dev-config:/config
      - fail2ban-dev-run:/var/run/fail2ban
      - /var/log:/var/log:ro
-      - ./logs:/remotelogs/bangui
+      - ../data/log:/remotelogs/bangui
    healthcheck:
      test: ["CMD", "fail2ban-client", "ping"]
      interval: 15s
@@ -58,6 +58,7 @@ services:
      BANGUI_DATABASE_PATH: "/data/bangui.db"
      BANGUI_FAIL2BAN_SOCKET: "/var/run/fail2ban/fail2ban.sock"
      BANGUI_FAIL2BAN_CONFIG_DIR: "/config/fail2ban"
+      BANGUI_LOG_FILE: "/data/log/bangui.log"
      BANGUI_LOG_LEVEL: "debug"
      BANGUI_ENABLE_DOCS: "true"
      BANGUI_SESSION_SECRET: "${BANGUI_SESSION_SECRET:?BANGUI_SESSION_SECRET must be set — generate with: python -c 'import secrets; print(secrets.token_hex(32))'}"
@@ -70,7 +71,7 @@ services:
    volumes:
      - ../backend/app:/app/app:z
      - ../fail2ban-master:/app/fail2ban-master:ro,z
-      - ../data/data:/data
+      - ../data:/data
      - fail2ban-dev-run:/var/run/fail2ban:ro
      - ../data/fail2ban-dev-config:/config:rw
    command:
--- a/Docker/compose.prod.yml
+++ b/Docker/compose.prod.yml
@@ -1,115 +0,0 @@
-# ──────────────────────────────────────────────────────────────
-#  BanGUI — Production Compose
-#
-#  Compatible with:
-#    docker compose -f Docker/compose.prod.yml up -d
-#    podman compose  -f Docker/compose.prod.yml up -d
-#    podman-compose  -f Docker/compose.prod.yml up -d
-#
-#  Prerequisites:
-#    Create a .env file at the project root (or pass --env-file):
-#      BANGUI_SESSION_SECRET=<random-secret>
-# ──────────────────────────────────────────────────────────────
-
-name: bangui
-
-services:
-  # ── fail2ban ─────────────────────────────────────────────────
-  fail2ban:
-    image: lscr.io/linuxserver/fail2ban:latest
-    container_name: bangui-fail2ban
-    restart: unless-stopped
-    cap_add:
-      - NET_ADMIN
-      - NET_RAW
-    network_mode: host
-    environment:
-      TZ: "${BANGUI_TIMEZONE:-UTC}"
-      PUID: 0
-      PGID: 0
-    volumes:
-      - fail2ban-config:/config
-      - fail2ban-run:/var/run/fail2ban
-      - /var/log:/var/log:ro
-    healthcheck:
-      test: ["CMD", "fail2ban-client", "ping"]
-      interval: 30s
-      timeout: 5s
-      start_period: 15s
-      retries: 3
-    # NOTE: The fail2ban-config volume must be pre-populated with the following files:
-    #   • fail2ban/jail.conf (or jail.d/*.conf) with the DEFAULT section containing:
-    #     banaction = iptables-allports[lockingopt="-w 5"]
-    #   This prevents xtables lock contention errors when multiple jails start in parallel.
-    #   See https://fail2ban.readthedocs.io/en/latest/development/environment.html
-
-  # ── Backend (FastAPI + uvicorn) ─────────────────────────────
-  backend:
-    build:
-      context: ..
-      dockerfile: Docker/Dockerfile.backend
-    container_name: bangui-backend
-    restart: unless-stopped
-    stop_grace_period: 30s
-    depends_on:
-      fail2ban:
-        condition: service_healthy
-    environment:
-      BANGUI_DATABASE_PATH: "/data/bangui.db"
-      BANGUI_FAIL2BAN_SOCKET: "/var/run/fail2ban/fail2ban.sock"
-      BANGUI_FAIL2BAN_CONFIG_DIR: "/config/fail2ban"
-      BANGUI_LOG_LEVEL: "info"
-      # ⚠️  BANGUI_WORKERS MUST be 1 — see session_cache.py docstring for details
-      # BanGUI uses a process-local session cache. Multiple workers in a single process
-      # would cause users to be randomly logged out as sessions wouldn't be shared.
-      # For HA, run multiple BanGUI instances (each with --workers 1) via orchestration.
-      BANGUI_WORKERS: "1"
-      BANGUI_SESSION_SECRET: "${BANGUI_SESSION_SECRET:?Set BANGUI_SESSION_SECRET}"
-      BANGUI_TIMEZONE: "${BANGUI_TIMEZONE:-UTC}"
-    volumes:
-      - bangui-data:/data
-      - fail2ban-run:/var/run/fail2ban:ro
-      - fail2ban-config:/config:rw
-    expose:
-      - "8000"
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8000/api/v1/health"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-      start_period: 40s
-    networks:
-      - bangui-net
-
-  # ── Frontend (nginx serving built SPA + API proxy) ──────────
-  frontend:
-    build:
-      context: ..
-      dockerfile: Docker/Dockerfile.frontend
-    container_name: bangui-frontend
-    restart: unless-stopped
-    ports:
-      - "${BANGUI_PORT:-8080}:80"
-    depends_on:
-      backend:
-        condition: service_healthy
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:80/"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-      start_period: 5s
-    networks:
-      - bangui-net
-
-volumes:
-  bangui-data:
-    driver: local
-  fail2ban-config:
-    driver: local
-  fail2ban-run:
-    driver: local
-
-networks:
-  bangui-net:
-    driver: bridge
--- a/Docker/docker-compose.yml
+++ b/Docker/docker-compose.yml
@@ -1,97 +0,0 @@
-version: '3.8'
-services:
-  fail2ban:
-    image: lscr.io/linuxserver/fail2ban:latest
-    container_name: fail2ban
-    cap_add:
-      - NET_ADMIN
-      - NET_RAW
-    network_mode: host
-    environment:
-      - PUID=1011
-      - PGID=1001
-      - TZ=Etc/UTC
-      - VERBOSITY=-vv #optional
-      
-    volumes:
-      - /server/server_fail2ban/config:/config
-      - /server/server_fail2ban/fail2ban-run:/var/run/fail2ban
-      - /var/log:/var/log
-      - /server/server_nextcloud/config/nextcloud.log:/remotelogs/nextcloud/nextcloud.log:ro #optional
-      - /server/server_nginx/data/logs:/remotelogs/nginx:ro #optional
-      - /server/server_gitea/log/gitea.log:/remotelogs/gitea/gitea.log:ro #optional
-      
-
-      #- /path/to/homeassistant/log:/remotelogs/homeassistant:ro #optional
-      #- /path/to/unificontroller/log:/remotelogs/unificontroller:ro #optional
-      #- /path/to/vaultwarden/log:/remotelogs/vaultwarden:ro #optional
-    restart: unless-stopped
-    deploy:
-      limits:
-        cpus: '0.5'
-        memory: 128M
-      reservations:
-        cpus: '0.1'
-        memory: 64M
-
-  backend:
-      image: git.lpl-mind.de/lukas.pupkalipinski/bangui/backend:latest
-      container_name: bangui-backend
-      restart: unless-stopped
-      stop_grace_period: 30s
-      depends_on:
-        fail2ban:
-          condition: service_started
-      environment:
-        - PUID=1011
-        - PGID=1001
-        - BANGUI_DATABASE_PATH=/data/bangui.db
-        - BANGUI_FAIL2BAN_SOCKET=/var/run/fail2ban/fail2ban.sock
-        - BANGUI_FAIL2BAN_CONFIG_DIR=/config/fail2ban
-        - BANGUI_LOG_LEVEL=info
-        # ⚠️  BANGUI_WORKERS MUST be 1 — the session cache is process-local
-        # Multiple workers would cause random logouts and duplicate background jobs
-        - BANGUI_SESSION_SECRET=${BANGUI_SESSION_SECRET:?Set BANGUI_SESSION_SECRET}
-        - BANGUI_TIMEZONE=${BANGUI_TIMEZONE:-UTC}
-      volumes:
-        - /server/server_fail2ban/bangui-data:/data
-        - /server/server_fail2ban/fail2ban-run:/var/run/fail2ban:ro
-        - /server/server_fail2ban/config:/config:rw
-      expose:
-        - "8000"
-      networks:
-        - bangui-net
-      deploy:
-        limits:
-          cpus: '2'
-          memory: 512M
-        reservations:
-          cpus: '1'
-          memory: 256M
-  
-    # ── Frontend (nginx serving built SPA + API proxy) ──────────
-  frontend:
-    image: git.lpl-mind.de/lukas.pupkalipinski/bangui/frontend:latest
-    container_name: bangui-frontend
-    restart: unless-stopped
-    environment:
-      - PUID=1011
-      - PGID=1001
-    ports:
-      - "${BANGUI_PORT:-8080}:80"
-    depends_on:
-      backend:
-        condition: service_started
-    networks:
-      - bangui-net
-    deploy:
-      limits:
-        cpus: '0.5'
-        memory: 128M
-      reservations:
-        cpus: '0.25'
-        memory: 64M
-  
-networks:
-  bangui-net:
-    name: bangui-net
--- a/Docker/simulate_failed_logins.sh
+++ b/Docker/simulate_failed_logins.sh
@@ -11,7 +11,7 @@
 #  Defaults:
 #    COUNT    : 5
 #    SOURCE_IP: 192.168.100.99
-#    LOG_FILE : Docker/logs/auth.log       (relative to repo root)
+#    LOG_FILE : data/log/auth.log         (relative to repo root)
 #
 #  Log line format (must match manual-Jail failregex exactly):
 #    YYYY-MM-DD HH:MM:SS bangui-auth: authentication failure from <IP>
@@ -25,7 +25,7 @@ readonly DEFAULT_IP="192.168.100.99"

 # Resolve script location so defaults work regardless of cwd.
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-readonly DEFAULT_LOG_FILE="${SCRIPT_DIR}/logs/auth.log"
+readonly DEFAULT_LOG_FILE="${SCRIPT_DIR}/../data/log/auth.log"

 # ── Arguments ─────────────────────────────────────────────────
 COUNT="${1:-${DEFAULT_COUNT}}"