Alexander/homepage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: correct IMAGE_DIR path to /var/www/static
All checks were successful
CI / update (push) Successful in 1m15s
Details

Browse Source 
Change production path check from /var/lib/www to /var/www/static
to match actual production environment configuration.

Updated migration endpoint and all documentation references.
This commit is contained in:
Alexander Bocken
2026-01-02 12:25:06 +01:00
parent 7a756b708f
commit c10fce5d4b
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
MIGRATION_IMAGE_HASHES.md
View File

@@ -20,15 +20,15 @@ The migration will:
- Otherwise → generate hash and create hashed copy - Otherwise → generate hash and create hashed copy
3. **Generate content hash** from the full-size image (8-char SHA-256) 3. **Generate content hash** from the full-size image (8-char SHA-256)
4. **Copy files** (keeps originals!) in all three directories: 4. **Copy files** (keeps originals!) in all three directories:
- `/var/lib/www/static/rezepte/full/` - `/var/www/static/rezepte/full/`
- `/var/lib/www/static/rezepte/thumb/` - `/var/www/static/rezepte/thumb/`
- `/var/lib/www/static/rezepte/placeholder/` - `/var/www/static/rezepte/placeholder/`
5. **Update database** with new hashed filename in `images[0].mediapath` 5. **Update database** with new hashed filename in `images[0].mediapath`
## Prerequisites ## Prerequisites
- **Authentication**: Either be logged in as admin OR have `ADMIN_SECRET_TOKEN` set - **Authentication**: Either be logged in as admin OR have `ADMIN_SECRET_TOKEN` set
- Only runs in production (when `IMAGE_DIR=/var/lib/www/static`) - Only runs in production (when `IMAGE_DIR=/var/www/static`)
- Requires confirmation token to prevent accidental runs - Requires confirmation token to prevent accidental runs
- Backup your database before running (recommended) - Backup your database before running (recommended)
@@ -59,7 +59,7 @@ Add this to your nginx site configuration for `bocken.org`:
```nginx ```nginx
location /static/rezepte/ { location /static/rezepte/ {
root /var/lib/www; root /var/www;
# Cache hashed files forever (they have content hash in filename) # Cache hashed files forever (they have content hash in filename)
location ~ /static/rezepte/(thumb|placeholder|full)/[^/]+\.[a-f0-9]{8}\.webp$ { location ~ /static/rezepte/(thumb|placeholder|full)/[^/]+\.[a-f0-9]{8}\.webp$ {
@@ -211,13 +211,13 @@ If something goes wrong:
2. **Files**: The original unhashed files are still on disk - no data loss 2. **Files**: The original unhashed files are still on disk - no data loss
3. **Remove hashed files** (optional): 3. **Remove hashed files** (optional):
```bash ```bash
cd /var/lib/www/static/rezepte cd /var/www/static/rezepte
find . -name '*.[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9].webp' -delete find . -name '*.[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9].webp' -delete
``` ```
## Safety Features ## Safety Features
1. ✅ **Production-only**: Won't run unless `IMAGE_DIR=/var/lib/www/static` 1. ✅ **Production-only**: Won't run unless `IMAGE_DIR=/var/www/static`
2. ✅ **Confirmation token**: Requires `{"confirm": "MIGRATE_IMAGES"}` in request body 2. ✅ **Confirmation token**: Requires `{"confirm": "MIGRATE_IMAGES"}` in request body
3. ✅ **Authentication**: Requires either logged-in user OR valid `ADMIN_SECRET_TOKEN` 3. ✅ **Authentication**: Requires either logged-in user OR valid `ADMIN_SECRET_TOKEN`
4. ✅ **Non-destructive**: Copies files (keeps originals) 4. ✅ **Non-destructive**: Copies files (keeps originals)
@@ -236,7 +236,7 @@ If something goes wrong:
### File Structure ### File Structure
``` ```
/var/lib/www/static/rezepte/ /var/www/static/rezepte/
├── full/ ├── full/
│ ├── maccaroni.webp ← Unhashed (fallback) │ ├── maccaroni.webp ← Unhashed (fallback)
│ ├── maccaroni.a1b2c3d4.webp ← Hashed (cache busting) │ ├── maccaroni.a1b2c3d4.webp ← Hashed (cache busting)
@@ -282,7 +282,7 @@ images: [{
If you encounter issues: If you encounter issues:
1. Check nginx error logs: `sudo tail -f /var/log/nginx/error.log` 1. Check nginx error logs: `sudo tail -f /var/log/nginx/error.log`
2. Check application logs for the migration endpoint 2. Check application logs for the migration endpoint
3. Verify file permissions on `/var/lib/www/static/rezepte/` 3. Verify file permissions on `/var/www/static/rezepte/`
4. Ensure database connection is working 4. Ensure database connection is working
The migration is designed to be safe and non-destructive. Original files are never deleted, only copied. The migration is designed to be safe and non-destructive. Original files are never deleted, only copied.

4
src/routes/api/admin/migrate-image-hashes/+server.ts
View File

@@ -11,7 +11,7 @@ import { rename } from 'node:fs/promises';
export const POST = (async ({ locals, request }) => { export const POST = (async ({ locals, request }) => {
// Only allow in production (check if IMAGE_DIR contains production path) // Only allow in production (check if IMAGE_DIR contains production path)
const isProd = IMAGE_DIR.includes('/var/lib/www'); const isProd = IMAGE_DIR.includes('/var/www/static');
// Require confirmation token to prevent accidental runs // Require confirmation token to prevent accidental runs
const data = await request.json(); const data = await request.json();
@@ -19,7 +19,7 @@ export const POST = (async ({ locals, request }) => {
const adminToken = data?.adminToken; const adminToken = data?.adminToken;
if (!isProd) { if (!isProd) {
throw error(403, 'This endpoint only runs in production (IMAGE_DIR must be /var/lib/www)'); throw error(403, 'This endpoint only runs in production (IMAGE_DIR must be /var/www/static)');
} }
if (confirmToken !== 'MIGRATE_IMAGES') { if (confirmToken !== 'MIGRATE_IMAGES') {