changes to the backlupo

backup.sh

@@ -3,7 +3,12 @@ set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 COMPOSE_FILE="docker-compose-multitenant.yml"
+
+# Directories
 INVOICE_ARCHIVE_DIR="${INVOICE_ARCHIVE_DIR:-/var/backups/invoice-archive}"
+FULL_BACKUP_DIR="${FULL_BACKUP_DIR:-/var/backups/inventarsystem}"
+LOG_DIR="$SCRIPT_DIR/logs"
+
 KEEP_DAYS="${INVOICE_KEEP_DAYS:-3650}"
 MODE="auto"
 BASE_NAME=""
@@ -14,9 +19,7 @@ Usage: $0 [options]
 
 Options:
   --invoice-archive-dir DIR   Directory for invoice archive files
-                              (default: $INVOICE_ARCHIVE_DIR)
-  --invoice-keep-days N       Remove archived invoice files older than N days
-                              (default: $KEEP_DAYS)
+  --invoice-keep-days N       Remove archived files older than N days
   --mode auto|docker|host     Backup mode (default: auto)
   --base-name NAME            Base filename prefix for archive files
   -h, --help                  Show this help message
@@ -57,25 +60,14 @@ parse_args() {
 
 ensure_directory() {
     mkdir -p "$INVOICE_ARCHIVE_DIR"
+    mkdir -p "$FULL_BACKUP_DIR"
 }
 
 cleanup_old_archives() {
     if [[ -n "$KEEP_DAYS" ]]; then
-        find "$INVOICE_ARCHIVE_DIR" -maxdepth 1 -type f \( -name 'invoices-*.jsonl' -o -name 'invoices-*.csv' -o -name 'invoices-*.meta.json' \) -mtime +"$KEEP_DAYS" -print -delete || true
+        find "$INVOICE_ARCHIVE_DIR" -maxdepth 1 -type f -mtime +"$KEEP_DAYS" -print -delete 2>/dev/null || true
     fi
-}
-
-host_backup() {
-    if ! command -v python3 >/dev/null 2>&1; then
-        return 1
-    fi
-    if ! python3 -c 'import pymongo' >/dev/null 2>&1; then
-        return 1
-    fi
-
-    python3 "$SCRIPT_DIR/Web/backup_invoices.py" \
-        --archive-dir "$INVOICE_ARCHIVE_DIR" \
-        --base-name "$BASE_NAME"
+    find "$FULL_BACKUP_DIR" -maxdepth 1 -type f -mtime +30 -print -delete 2>/dev/null || true
 }
 
 docker_backup() {
@@ -86,39 +78,55 @@ docker_backup() {
         return 1
     fi
 
-    local app_container
-    app_container="$(docker compose -f "$COMPOSE_FILE" ps -q app | tr -d '[:space:]')"
-    if [[ -z "$app_container" ]]; then
-        return 1
-    fi
-
     local timestamp
     timestamp="$(date +'%Y-%m-%d_%H-%M-%S')"
-    local output_dir
-    local remote_base
 
-    output_dir="/tmp/invoice_archive_${timestamp}"
-    remote_base="${output_dir}/${BASE_NAME}"
+    echo "[$(date +'%T')] Starting full system backup..."
 
-    # Erstellt den Ordner, führt das Skript mit dem KORREKTEN Pfad aus und kopiert die Dateien
-    docker compose -f "$COMPOSE_FILE" exec -T app mkdir -p "$output_dir" && \
-    docker compose -f "$COMPOSE_FILE" exec -T app python3 /app/Web/modules/inventarsystem/backup_invoices.py \
-        --archive-dir "$output_dir" \
-        --base-name "$BASE_NAME" && \
-    mkdir -p "$INVOICE_ARCHIVE_DIR" && \
-    docker cp "$app_container":"${remote_base}.jsonl" "$INVOICE_ARCHIVE_DIR/" && \
-    docker cp "$app_container":"${remote_base}.csv" "$INVOICE_ARCHIVE_DIR/" && \
-    docker cp "$app_container":"${remote_base}.meta.json" "$INVOICE_ARCHIVE_DIR/"
-    
-    local backup_status=$?
+    # 1. Full MongoDB Dump
+    if docker compose -f "$COMPOSE_FILE" ps -q mongodb >/dev/null 2>&1; then
+        echo "[$(date +'%T')] Creating MongoDB dump..."
+        docker compose -f "$COMPOSE_FILE" exec -T mongodb mongodump --archive --gzip > "$FULL_BACKUP_DIR/full_db_${timestamp}.archive.gz"
+    else
+        echo "Warning: MongoDB container not found. Skipping DB dump."
+    fi
 
-    # Räumt den temporären Ordner im Container auf
-    docker compose -f "$COMPOSE_FILE" exec -T app rm -rf "$output_dir"
+    # 2. Archive Logs
+    if [ -d "$LOG_DIR" ]; then
+        echo "[$(date +'%T')] Archiving logs..."
+        tar -czf "$FULL_BACKUP_DIR/logs_${timestamp}.tar.gz" -C "$(dirname "$LOG_DIR")" "$(basename "$LOG_DIR")"
+    fi
 
-    return $backup_status
+    # 3. Legacy Invoice Export
+    local app_container
+    app_container="$(docker compose -f "$COMPOSE_FILE" ps -q app | tr -d '[:space:]')"
+    if [[ -n "$app_container" ]]; then
+        local output_dir="/tmp/invoice_archive_${timestamp}"
+        local remote_base="${output_dir}/${BASE_NAME}"
+
+        docker compose -f "$COMPOSE_FILE" exec -T app mkdir -p "$output_dir"
+        
+        docker compose -f "$COMPOSE_FILE" exec -T app python3 /app/Web/modules/inventarsystem/backup_invoices.py \
+            --archive-dir "$output_dir" \
+            --base-name "$BASE_NAME" >/dev/null 2>&1 || true
+        
+        if docker compose -f "$COMPOSE_FILE" exec -T app test -f "${remote_base}.jsonl"; then
+            docker cp "$app_container":"${remote_base}.jsonl" "$INVOICE_ARCHIVE_DIR/"
+            docker cp "$app_container":"${remote_base}.csv" "$INVOICE_ARCHIVE_DIR/"
+            docker cp "$app_container":"${remote_base}.meta.json" "$INVOICE_ARCHIVE_DIR/"
+        else
+            echo "[$(date +'%T')] Info: No invoice records found to export."
+        fi
+
+        docker compose -f "$COMPOSE_FILE" exec -T app rm -rf "$output_dir"
+    fi
+
+    return 0
 }
 
 main() {
+    parse_args "$@"
+
     if [[ -z "$BASE_NAME" ]]; then
         BASE_NAME="invoices-$(date +'%Y-%m-%d_%H-%M-%S')"
     fi
@@ -126,32 +134,12 @@ main() {
     ensure_directory
 
     case "$MODE" in
-        auto)
+        auto|docker)
             if docker_backup; then
                 cleanup_old_archives
                 return 0
             fi
-            if host_backup; then
-                cleanup_old_archives
-                return 0
-            fi
-            echo "Error: could not perform invoice backup in auto mode. Docker or host Python with pymongo is required." >&2
-            return 1
-            ;;
-        docker)
-            if docker_backup; then
-                cleanup_old_archives
-                return 0
-            fi
-            echo "Error: docker backup failed or app container is unavailable." >&2
-            return 1
-            ;;
-        host)
-            if host_backup; then
-                cleanup_old_archives
-                return 0
-            fi
-            echo "Error: host backup failed. Ensure python3 and pymongo are installed." >&2
+            echo "Error: Docker backup failed." >&2
             return 1
             ;;
         *)
@@ -162,5 +150,4 @@ main() {
     esac
 }
 
-parse_args "$@"
-main
+main "$@"