Update 2 files

wikijs/backup.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
+# shellcheck disable=SC1091
 source "${AGENT_PATH}/common.sh"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${SCRIPT_DIR}/_volumes.sh"
 _check_required_env_vars "CONTAINER_NAME" "DATA_PATH" "DB_NAME" "DB_USER"
 
 # Export variables for docker compose
@@ -8,31 +10,21 @@ export CONTAINER_NAME DATA_PATH HTTP_PORT PUID PGID TZ IMAGE_TAG DB_NAME DB_USER
 
 cd "$SCRIPT_DIR"
 
-# Create backup directory
-BACKUP_DIR="${DATA_PATH}/backups"
-mkdir -p "$BACKUP_DIR"
-
-TIMESTAMP=$(date +%Y%m%d_%H%M%S)
-BACKUP_FILE="${BACKUP_DIR}/wikijs_backup_${TIMESTAMP}.tar.gz"
-
-echo "Creating backup..."
-
-# Dump PostgreSQL database
+# Dump PostgreSQL database before backup
 echo "Dumping PostgreSQL database..."
-docker exec ${CONTAINER_NAME}_db pg_dump -U "$DB_USER" "$DB_NAME" > "${BACKUP_DIR}/database.sql" || _die "Failed to dump database"
+docker exec ${CONTAINER_NAME}_db pg_dump -U "$DB_USER" "$DB_NAME" > "${DATA_PATH}/database.sql" || _die "Failed to dump database"
 
-# Create tarball of config, data, and database dump
-echo "Creating backup archive..."
-tar -czf "$BACKUP_FILE" \
-    -C "${DATA_PATH}" \
-    config \
-    data \
-    -C "${BACKUP_DIR}" \
-    database.sql \
-    || _die "Failed to create backup archive"
+# Stop containers for consistent backup
+docker compose stop
 
-# Clean up temporary database dump
-rm -f "${BACKUP_DIR}/database.sql"
+# Backup using dropshell's backup system
+# shellcheck disable=SC2046
+backup_items $(get_wikijs_volumes) || _die "Failed to create backup"
 
-echo "Backup created: $BACKUP_FILE"
-echo "Backup size: $(du -h "$BACKUP_FILE" | cut -f1)"
+# Clean up database dump (it's now in the backup)
+rm -f "${DATA_PATH}/database.sql"
+
+# Restart containers
+docker compose start
+
+echo "Backup created successfully"