chore(verify): PR validation workflow, pnpm Solana peer, lockfile check, backup SSH
- Gitea: add validate-on-pr.yml (run-all-validation only; no deploy) - .env.master.example: document NPM_EMAIL/NPM_PASSWORD for backup-npmplus - pnpm: allowedVersions for @solana/sysvars to quiet thirdweb/x402 peer drift - AGENTS + verify README: CI pointers and .env.master.example for env - backup-npmplus: npm_lxc_ssh helper; keep prior timeout/BatchMode behavior - check-pnpm-workspace-lockfile + run-all-validation step 1b (from prior work in same commit set) Made-with: Cursor
This commit is contained in:
defiQUG
@@ -40,9 +40,15 @@ fi
|
||||
NPMPLUS_VMID="${NPMPLUS_VMID:-${NPM_VMID:-10233}}"
|
||||
NPMPLUS_HOST="${NPMPLUS_HOST:-${NPM_PROXMOX_HOST:-${PROXMOX_HOST:-${PROXMOX_HOST_R630_01:-192.168.11.11}}}}"
|
||||
NPM_URL="${NPM_URL:-https://${IP_NPMPLUS:-${IP_NPMPLUS:-192.168.11.167}}:81}"
|
||||
NPM_EMAIL="${NPM_EMAIL:-nsatoshi2007@hotmail.com}"
|
||||
# Set NPM_EMAIL in .env (no default — avoids baking personal addresses in repo defaults)
|
||||
NPM_EMAIL="${NPM_EMAIL:-}"
|
||||
NPM_PASSWORD="${NPM_PASSWORD:-}"
|
||||
|
||||
# Proxmox host: SSH to node running NPM LXC (consistent timeouts, BatchMode for automation)
|
||||
npm_lxc_ssh() {
|
||||
ssh -o ConnectTimeout=15 -o BatchMode=yes "root@$NPMPLUS_HOST" "$@"
|
||||
}
|
||||
|
||||
DRY_RUN=false
|
||||
[[ "${1:-}" == "--dry-run" ]] && DRY_RUN=true
|
||||
|
||||
@@ -57,11 +63,16 @@ echo "💾 NPMplus Backup Script"
|
||||
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
||||
echo ""
|
||||
|
||||
# Validate NPM password (skip for dry-run)
|
||||
if [ -z "$NPM_PASSWORD" ] && [[ "$DRY_RUN" != true ]]; then
|
||||
log_error "NPM_PASSWORD environment variable is required"
|
||||
log_info "Set it in .env file or export it before running this script"
|
||||
# Validate NPM password and API identity (skip for dry-run)
|
||||
if [[ "$DRY_RUN" != true ]]; then
|
||||
if [ -z "$NPM_PASSWORD" ]; then
|
||||
log_error "NPM_PASSWORD is required (set in .env or export before running)"
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "$NPM_EMAIL" ]; then
|
||||
log_error "NPM_EMAIL is required for API export steps (set in .env; no default)"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ "$DRY_RUN" == true ]]; then
|
||||
@@ -79,29 +90,56 @@ log_info "Step 1: Backing up NPMplus database..."
|
||||
DB_BACKUP_DIR="$BACKUP_DIR/database"
|
||||
mkdir -p "$DB_BACKUP_DIR"
|
||||
|
||||
# Discover database.sqlite (path differs across images / mount layouts)
|
||||
NPM_DB_PATH=$(
|
||||
npm_lxc_ssh "pct exec $NPMPLUS_VMID -- sh -c '
|
||||
for p in /data/database.sqlite /data/database/database.sqlite; do
|
||||
[ -f \"\$p\" ] && { echo \"\$p\"; exit 0; }
|
||||
done
|
||||
f=\$(find /data -maxdepth 6 -name database.sqlite 2>/dev/null | head -1)
|
||||
if [ -n \"\$f\" ] && [ -f \"\$f\" ]; then echo \"\$f\"; else echo \"\"; fi
|
||||
'" 2>/dev/null | tr -d '\r' || true
|
||||
)
|
||||
NPM_DB_PATH="${NPM_DB_PATH//$'\n'/}"
|
||||
if [ -n "$NPM_DB_PATH" ]; then
|
||||
log_info " Found DB at: $NPM_DB_PATH (inside LXC)"
|
||||
else
|
||||
log_info " No database.sqlite at common paths; dump may be skipped (check container / mounts)"
|
||||
fi
|
||||
# Method 1: SQL dump
|
||||
log_info " Creating SQL dump..."
|
||||
ssh root@"$NPMPLUS_HOST" "pct exec $NPMPLUS_VMID -- bash -c '
|
||||
if [ -f /data/database.sqlite ]; then
|
||||
sqlite3 /data/database.sqlite \".dump\" > /tmp/npm-database.sql 2>/dev/null || echo \"Database export may have issues\"
|
||||
cat /tmp/npm-database.sql
|
||||
NPM_DB_PQ=""
|
||||
[ -n "$NPM_DB_PATH" ] && NPM_DB_PQ=$(printf %q "$NPM_DB_PATH")
|
||||
if [ -n "$NPM_DB_PATH" ]; then
|
||||
npm_lxc_ssh "pct exec $NPMPLUS_VMID -- sh -c \"if command -v sqlite3 >/dev/null 2>&1; then sqlite3 $NPM_DB_PQ .dump; else echo _NO_SQLITE3; fi\"" \
|
||||
> "$DB_BACKUP_DIR/database.sql" 2>/dev/null || : > "$DB_BACKUP_DIR/database.sql"
|
||||
if grep -qxF '_NO_SQLITE3' "$DB_BACKUP_DIR/database.sql" 2>/dev/null; then
|
||||
: > "$DB_BACKUP_DIR/database.sql"
|
||||
fi
|
||||
else
|
||||
: > "$DB_BACKUP_DIR/database.sql"
|
||||
fi
|
||||
|
||||
# Method 2: Direct file copy (binary; complements SQL)
|
||||
if [ -n "$NPM_DB_PATH" ]; then
|
||||
log_info " Copying database file (binary)..."
|
||||
if ! npm_lxc_ssh "pct exec $NPMPLUS_VMID -- sh -c \"cat $NPM_DB_PQ\"" > "$DB_BACKUP_DIR/database.sqlite" 2>/dev/null; then
|
||||
if [ -s "$DB_BACKUP_DIR/database.sql" ] && grep -qiE 'CREATE|INSERT|PRAGMA' "$DB_BACKUP_DIR/database.sql" 2>/dev/null; then
|
||||
log_info " Skipped or failed binary copy; SQL dump contains schema/data and is usable for restore"
|
||||
else
|
||||
echo \"Database file not found\"
|
||||
log_warn " Direct copy failed and SQL dump empty or unusable — check LXC/SSH, sqlite3, or volume mount"
|
||||
fi
|
||||
'" > "$DB_BACKUP_DIR/database.sql" || {
|
||||
log_warn " SQL dump failed, trying direct copy..."
|
||||
}
|
||||
|
||||
# Method 2: Direct file copy
|
||||
log_info " Copying database file..."
|
||||
ssh root@"$NPMPLUS_HOST" "pct exec $NPMPLUS_VMID -- cat /data/database.sqlite" > "$DB_BACKUP_DIR/database.sqlite" 2>/dev/null || {
|
||||
log_warn " Direct copy failed - database may not exist or container may be down"
|
||||
}
|
||||
|
||||
if [ -s "$DB_BACKUP_DIR/database.sql" ] || [ -s "$DB_BACKUP_DIR/database.sqlite" ]; then
|
||||
else
|
||||
log_info " Binary database copy OK"
|
||||
fi
|
||||
else
|
||||
: > "$DB_BACKUP_DIR/database.sqlite"
|
||||
log_info " Skipping binary copy (no DB file resolved)"
|
||||
fi
|
||||
if ( [ -s "$DB_BACKUP_DIR/database.sql" ] && grep -qiE 'CREATE|INSERT|PRAGMA' "$DB_BACKUP_DIR/database.sql" 2>/dev/null ) || [ -s "$DB_BACKUP_DIR/database.sqlite" ]; then
|
||||
log_success " Database backup completed"
|
||||
else
|
||||
log_warn " Database backup may be empty - check container status"
|
||||
log_warn " Database backup empty — LXC not reachable, DB path changed, or sqlite3 missing in container"
|
||||
fi
|
||||
|
||||
# Step 2: Export Proxy Hosts via API
|
||||
@@ -152,11 +190,24 @@ log_info "Step 3: Backing up certificate files..."
|
||||
CERT_BACKUP_DIR="$BACKUP_DIR/certificates"
|
||||
mkdir -p "$CERT_BACKUP_DIR"
|
||||
|
||||
# List all certificates
|
||||
log_info " Listing certificates..."
|
||||
ssh root@"$NPMPLUS_HOST" "pct exec $NPMPLUS_VMID -- ls -1 /data/tls/certbot/live/ 2>/dev/null" > "$CERT_BACKUP_DIR/cert_list.txt" 2>/dev/null || {
|
||||
log_warn " Could not list certificates - path may differ"
|
||||
}
|
||||
CERT_LIVE_BASE=""
|
||||
for _try in /data/tls/certbot/live /etc/letsencrypt/live /data/letsencrypt/live; do
|
||||
if npm_lxc_ssh "pct exec $NPMPLUS_VMID -- test -d '$_try'" 2>/dev/null; then
|
||||
CERT_LIVE_BASE="$_try"
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
# List all certificate directories (NPM+ Certbot / Linux layouts)
|
||||
if [ -n "$CERT_LIVE_BASE" ]; then
|
||||
log_info " Listing certificates (from $CERT_LIVE_BASE)..."
|
||||
npm_lxc_ssh "pct exec $NPMPLUS_VMID -- ls -1 $CERT_LIVE_BASE/ 2>/dev/null" | grep -v '^lost+found$' | grep -v '^$' > "$CERT_BACKUP_DIR/cert_list.txt" 2>/dev/null || {
|
||||
: > "$CERT_BACKUP_DIR/cert_list.txt"
|
||||
}
|
||||
else
|
||||
: > "$CERT_BACKUP_DIR/cert_list.txt"
|
||||
log_info " No Certbot/letsencrypt live dir in common paths; PEM files may be elsewhere or API-only"
|
||||
fi
|
||||
|
||||
# Copy certificate files
|
||||
if [ -s "$CERT_BACKUP_DIR/cert_list.txt" ]; then
|
||||
@@ -164,22 +215,25 @@ if [ -s "$CERT_BACKUP_DIR/cert_list.txt" ]; then
|
||||
while IFS= read -r cert_dir; do
|
||||
if [ -n "$cert_dir" ] && [ "$cert_dir" != "lost+found" ]; then
|
||||
mkdir -p "$CERT_BACKUP_DIR/$cert_dir"
|
||||
|
||||
# Copy fullchain.pem
|
||||
ssh root@"$NPMPLUS_HOST" "pct exec $NPMPLUS_VMID -- cat /data/tls/certbot/live/$cert_dir/fullchain.pem" > "$CERT_BACKUP_DIR/$cert_dir/fullchain.pem" 2>/dev/null || {
|
||||
npm_lxc_ssh "pct exec $NPMPLUS_VMID -- cat $CERT_LIVE_BASE/$cert_dir/fullchain.pem" > "$CERT_BACKUP_DIR/$cert_dir/fullchain.pem" 2>/dev/null || {
|
||||
log_warn " Failed to copy fullchain.pem for $cert_dir"
|
||||
}
|
||||
|
||||
# Copy privkey.pem
|
||||
ssh root@"$NPMPLUS_HOST" "pct exec $NPMPLUS_VMID -- cat /data/tls/certbot/live/$cert_dir/privkey.pem" > "$CERT_BACKUP_DIR/$cert_dir/privkey.pem" 2>/dev/null || {
|
||||
npm_lxc_ssh "pct exec $NPMPLUS_VMID -- cat $CERT_LIVE_BASE/$cert_dir/privkey.pem" > "$CERT_BACKUP_DIR/$cert_dir/privkey.pem" 2>/dev/null || {
|
||||
log_warn " Failed to copy privkey.pem for $cert_dir"
|
||||
}
|
||||
fi
|
||||
done < "$CERT_BACKUP_DIR/cert_list.txt"
|
||||
|
||||
log_success " Certificate files backed up"
|
||||
log_success " Certificate files backed up (where readable)"
|
||||
else
|
||||
log_warn " No certificates found to backup"
|
||||
API_CERT_N=0
|
||||
if [ -f "$API_BACKUP_DIR/certificates.json" ] && command -v jq >/dev/null 2>&1; then
|
||||
API_CERT_N=$(jq 'if type == "array" then length else 0 end' "$API_BACKUP_DIR/certificates.json" 2>/dev/null) || API_CERT_N=0
|
||||
fi
|
||||
if [ "$API_CERT_N" -gt 0 ] 2>/dev/null; then
|
||||
log_info " No on-disk cert dirs listed; $API_CERT_N certificate(s) in api/certificates.json (PEMs may be internal only)"
|
||||
else
|
||||
log_info " No separate PEM backup (none listed or API export missing)"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Step 4: Backup Docker Volume (if accessible)
|
||||
@@ -187,10 +241,12 @@ log_info "Step 4: Attempting Docker volume backup..."
|
||||
VOLUME_BACKUP_DIR="$BACKUP_DIR/volumes"
|
||||
mkdir -p "$VOLUME_BACKUP_DIR"
|
||||
|
||||
# Try to export Docker volume
|
||||
ssh root@"$NPMPLUS_HOST" "pct exec $NPMPLUS_VMID -- docker volume ls" > "$VOLUME_BACKUP_DIR/volume_list.txt" 2>/dev/null || {
|
||||
log_warn " Could not list Docker volumes"
|
||||
}
|
||||
# Optional: list Docker volumes if docker exists in the LXC
|
||||
if npm_lxc_ssh "pct exec $NPMPLUS_VMID -- docker volume ls" > "$VOLUME_BACKUP_DIR/volume_list.txt" 2>/dev/null; then
|
||||
log_info " Docker volume list written (if NPM uses host paths instead, that is still OK)"
|
||||
else
|
||||
log_info " No Docker in LXC or not used — skip volume list"
|
||||
fi
|
||||
|
||||
# Step 5: Create backup manifest
|
||||
log_info "Step 5: Creating backup manifest..."
|
||||
|
||||
Reference in New Issue
Block a user