jared
/
server-desktop-01
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(backup): correct Synology SFTP path and remove pre-flight check 

SFTP uses a virtual root where Synology shared folders appear directly
under / — /volume1/... does not exist in SFTP space. The repo lives at
/homes/jared/Backups/fedora-workstation, not /home/Backups/... .

Also removes the pre-flight reachability check (HTTP curl, previously SSH)
that has been the source of every Synology skip since May 24. Restic
handles unreachable SFTP endpoints gracefully; no gate needed.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
jared 2026-06-05 11:47:03 -04:00
parent 309232cb26
commit 7ee7df68ee
2 changed files with 31 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
docs/synology.md
View File

@ -25,23 +25,31 @@ uid=1026(jared) gid=100(users) groups=100(users),101(administrators),65536(famil
## Volume Paths ## Volume Paths
Synology shared folders are mounted under `/volume1` over SSH. **SSH and SFTP use completely different namespaces.** Do not mix them up.
Important paths: **SSH shell** (`ssh synology`): home is `/var/services/homes/jared` (symlink to `/volume1/homes/jared`). Volume-level paths like `/volume1/...` are accessible.
**SFTP / restic**: shared folders appear directly under `/` as a virtual root. `/volume1` does not exist in SFTP space.
```bash
# SFTP root listing
sftp synology <<'EOF'
ls /
EOF
# → archive backup home homes music proxmox_backup
```
Active restic repo (SFTP path):
| Purpose | SFTP path |
| --- | --- |
| Fedora restic repo | `/homes/jared/Backups/fedora-workstation` |
Active restic repo (SSH path, for manual inspection):
| Purpose | SSH path | | Purpose | SSH path |
| --- | --- | | --- | --- |
| Main backup share | `/volume1/backup` | | Fedora restic repo | `~/Backups/fedora-workstation` = `/volume1/homes/jared/Backups/fedora-workstation` |
| Fedora continuous restic repo | `/volume1/backup/fedora_desktop_backup_continuous` |
| Older May 2024 user backup | `/volume1/backup/jared_backup052124` |
| Older May 2024 Fedora backup | `/volume1/backup/fedora_backup052124` |
| October 2024 Fedora recovery folder | `/volume1/backup/fedora_recovery_oct2024` |
List likely backup folders:
```bash
ssh synology 'find /volume1/backup -maxdepth 2 -mindepth 1 -type d | sort'
```
## Restic Access ## Restic Access
@ -54,20 +62,16 @@ source ~/.credentials
restic -r "sftp:${SYNOLOGY_HOST}:${SYNOLOGY_PATH}" snapshots --compact restic -r "sftp:${SYNOLOGY_HOST}:${SYNOLOGY_PATH}" snapshots --compact
``` ```
As of 2026-05-14, `~/.credentials` has: As of 2026-06-05, `~/.credentials` has:
```text ```text
SYNOLOGY_HOST=synology SYNOLOGY_HOST=synology
SYNOLOGY_PATH=/home/Backups/fedora-workstation SYNOLOGY_PATH=/homes/jared/Backups/fedora-workstation
``` ```
Note: that SFTP path is a virtual path for restic/SFTP access. Over an interactive SSH shell, the same repository is visible at: The leading path segment `homes` is the Synology shared folder name (visible in DSM), not a filesystem path. `/volume1/homes/...` is the SSH/filesystem equivalent but does not exist in SFTP space.
```text Repository structure:
/volume1/backup/fedora_desktop_backup_continuous
```
Repository structure confirmed on 2026-05-14:
```text ```text
config config
@ -111,15 +115,11 @@ restic -r "sftp:${SYNOLOGY_HOST}:${SYNOLOGY_PATH}" restore latest \
--include /home/jared/path/to/file --include /home/jared/path/to/file
``` ```
## Snapshot State on 2026-05-14 ## Snapshot State on 2026-06-05
The Fedora continuous repo is accessible and decrypts successfully. It had 17 snapshots from 2026-04-11 through 2026-05-11. The Fedora restic repo was stalled since 2026-05-24 due to wrong SFTP path in `~/.credentials` (`/home/...` instead of `/homes/...`). Fixed 2026-06-05. Manual backup run confirmed new snapshot saved. Two stale locks were also cleared before the run.
Latest snapshot observed: Prior to fix, B2 had been running successfully every night; only Synology was affected.
```text
c4ec0c91 2026-05-11 01:58:03 host=fedora tag=fedora size=18.779 GiB
```
## SSH Key Recovery Findings ## SSH Key Recovery Findings

15
scripts/backup.sh
View File

@ -60,18 +60,9 @@ run_and_notify() {
echo "=== Backup started $(date) ===" | tee -a "$LOG" echo "=== Backup started $(date) ===" | tee -a "$LOG"
# Synology: attempt only if reachable (SSH key auth, 30s timeout for HDD spin-up) # Synology SFTP: attempt directly — restic fails fast if unreachable, no pre-flight needed
if ssh -o ConnectTimeout=30 -o BatchMode=yes synology 'ls /volume1/backup > /dev/null 2>&1' 2>/dev/null; then restic -r "sftp:${SYNOLOGY_HOST}:${SYNOLOGY_PATH}" unlock 2>&1 | tee -a "$LOG" || true
run_and_notify "sftp:${SYNOLOGY_HOST}:${SYNOLOGY_PATH}" "Synology" "desktop" "synology" run_and_notify "sftp:${SYNOLOGY_HOST}:${SYNOLOGY_PATH}" "Synology" "desktop" "synology" || true
else
echo "Synology unreachable — skipping SFTP backup" | tee -a "$LOG"
notify_backup.rb \
--machine desktop \
--destination synology \
--status skipped \
--log-path "$LOG" \
--notes "Synology unreachable at $(date)" || true
fi
# B2: clear any stale lock before attempting (safe no-op if no lock exists) # B2: clear any stale lock before attempting (safe no-op if no lock exists)
restic -r "b2:${B2_BUCKET}:" unlock 2>&1 | tee -a "$LOG" || true restic -r "b2:${B2_BUCKET}:" unlock 2>&1 | tee -a "$LOG" || true