f8606a45ff
Deploy to VPS / deploy (push) Has been cancelled
Two changes that together make Site Settings actually work end-to-end.
BRANDING ASSET SERVING (the broken thumbnails fix)
The favicon/logo previews were broken because uploaded files in
/public/branding had no path to reach the browser:
1. The folder wasn't mounted into the app container, so uploads
vanished on next deploy
2. Nginx had no location block, so /branding/foo.png returned 404
(everything not in cases/applications/news/parts/footage was a
proxy_pass to Next.js, which doesn't serve from /public/branding
in standalone mode)
Fix:
- docker-compose.yml: ./public/branding mounted to /app/public/branding
(write side) AND /srv/branding (read-only side for Nginx)
- nginx/conf.d/flux.conf: new "location /branding/" block, same
cache strategy as the other asset locations (max-age=300, must-revalidate)
FOOTER EMAIL + PHONE (David's request)
- siteSettingsTypes.ts: hqEmail and hqPhone fields added to FooterSettings,
pre-filled with sales@lethepowerflux.com and +39 0424 287 492
- Footer.tsx: clickable mailto: and tel: links with Mail / Phone icons
shown right under the HQ address. Hidden when fields are empty so the
layout stays clean for editors who want to suppress contact info.
- /hq-command/dashboard/settings: new "Headquarters contact" group in
the Footer tab with the two fields (auto-translate ignores them, since
emails and phone numbers don't need translation).
DEPLOY (David)
cd /opt/flux-srl
mkdir -p public/branding # one-time, creates the folder if missing
git pull
docker compose up -d --build app
docker compose exec nginx nginx -t
docker compose exec nginx nginx -s reload
183 lines
6.1 KiB
Plaintext
183 lines
6.1 KiB
Plaintext
limit_req_zone $binary_remote_addr zone=api:10m rate=10r/s;
|
|
limit_req_zone $binary_remote_addr zone=login:10m rate=5r/s;
|
|
|
|
upstream nextjs {
|
|
server app:3000;
|
|
keepalive 32;
|
|
}
|
|
|
|
server {
|
|
listen 80;
|
|
server_name rf-flux.com www.rf-flux.com;
|
|
|
|
location /.well-known/acme-challenge/ {
|
|
root /var/www/certbot;
|
|
}
|
|
|
|
location / {
|
|
return 301 https://$host$request_uri;
|
|
}
|
|
}
|
|
|
|
server {
|
|
listen 443 ssl;
|
|
http2 on;
|
|
client_max_body_size 500M;
|
|
server_name rf-flux.com www.rf-flux.com;
|
|
|
|
ssl_certificate /etc/letsencrypt/live/rf-flux.com/fullchain.pem;
|
|
ssl_certificate_key /etc/letsencrypt/live/rf-flux.com/privkey.pem;
|
|
ssl_protocols TLSv1.2 TLSv1.3;
|
|
ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384;
|
|
ssl_prefer_server_ciphers off;
|
|
ssl_session_timeout 1d;
|
|
ssl_session_cache shared:SSL:10m;
|
|
ssl_session_tickets off;
|
|
|
|
add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" always;
|
|
|
|
# Next.js bundles use content hashing — safe to cache forever
|
|
location /_next/static/ {
|
|
proxy_pass http://nextjs;
|
|
expires 365d;
|
|
add_header Cache-Control "public, immutable";
|
|
access_log off;
|
|
}
|
|
|
|
# Next.js image optimizer — short cache, browser revalidates
|
|
location /_next/image {
|
|
proxy_pass http://nextjs;
|
|
proxy_set_header Host $host;
|
|
proxy_set_header X-Real-IP $remote_addr;
|
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
proxy_set_header X-Forwarded-Proto $scheme;
|
|
proxy_cache_bypass $http_upgrade;
|
|
add_header Cache-Control "public, max-age=300, must-revalidate" always;
|
|
}
|
|
|
|
location /hq-command/login {
|
|
limit_req zone=login burst=10 nodelay;
|
|
proxy_pass http://nextjs;
|
|
proxy_set_header Host $host;
|
|
proxy_set_header X-Real-IP $remote_addr;
|
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
proxy_set_header X-Forwarded-Proto $scheme;
|
|
}
|
|
|
|
# Asset uploads (large files, long timeout)
|
|
location /api/assets {
|
|
client_max_body_size 500M;
|
|
proxy_pass http://nextjs;
|
|
proxy_set_header Host $host;
|
|
proxy_set_header X-Real-IP $remote_addr;
|
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
proxy_set_header X-Forwarded-Proto $scheme;
|
|
proxy_read_timeout 600s;
|
|
proxy_send_timeout 600s;
|
|
proxy_request_buffering off;
|
|
}
|
|
|
|
location /api/public-upload {
|
|
client_max_body_size 500M;
|
|
proxy_pass http://nextjs;
|
|
proxy_set_header Host $host;
|
|
proxy_set_header X-Real-IP $remote_addr;
|
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
proxy_set_header X-Forwarded-Proto $scheme;
|
|
proxy_read_timeout 600s;
|
|
proxy_send_timeout 600s;
|
|
proxy_request_buffering off;
|
|
}
|
|
|
|
location /hq-command/ {
|
|
proxy_pass http://nextjs;
|
|
proxy_set_header Host $host;
|
|
proxy_set_header X-Real-IP $remote_addr;
|
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
proxy_set_header X-Forwarded-Proto $scheme;
|
|
}
|
|
|
|
location /api/chat {
|
|
limit_req zone=api burst=20 nodelay;
|
|
proxy_pass http://nextjs;
|
|
proxy_set_header Host $host;
|
|
proxy_set_header X-Real-IP $remote_addr;
|
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
proxy_set_header X-Forwarded-Proto $scheme;
|
|
proxy_http_version 1.1;
|
|
proxy_set_header Connection '';
|
|
proxy_buffering off;
|
|
proxy_cache off;
|
|
proxy_read_timeout 120s;
|
|
}
|
|
|
|
location /api/health {
|
|
proxy_pass http://nextjs;
|
|
access_log off;
|
|
}
|
|
|
|
# ─────────────────────────────────────────────────────────────────
|
|
# User-uploaded assets — served directly from disk (bypass Next.js)
|
|
#
|
|
# Cache strategy: short max-age + must-revalidate.
|
|
# Browser caches for 5 minutes, then asks Nginx "did this change?"
|
|
# via If-Modified-Since. Nginx auto-replies 304 (Not Modified) if the
|
|
# file's mtime is unchanged, or serves the new file if it changed.
|
|
# This means new CMS uploads appear within ~5 min without rebuild
|
|
# AND saved bandwidth on unchanged files.
|
|
# ─────────────────────────────────────────────────────────────────
|
|
|
|
location /cases/ {
|
|
alias /srv/cases/;
|
|
add_header Cache-Control "public, max-age=300, must-revalidate" always;
|
|
access_log off;
|
|
}
|
|
|
|
location /applications/ {
|
|
alias /srv/applications/;
|
|
add_header Cache-Control "public, max-age=300, must-revalidate" always;
|
|
access_log off;
|
|
}
|
|
|
|
location /news/ {
|
|
alias /srv/news/;
|
|
add_header Cache-Control "public, max-age=300, must-revalidate" always;
|
|
access_log off;
|
|
}
|
|
|
|
location /parts/ {
|
|
alias /srv/parts/;
|
|
add_header Cache-Control "public, max-age=300, must-revalidate" always;
|
|
access_log off;
|
|
}
|
|
|
|
location /operations-inbox/ {
|
|
alias /srv/operations-inbox/;
|
|
add_header Cache-Control "private, max-age=60, must-revalidate" always;
|
|
access_log off;
|
|
}
|
|
|
|
location /footage/ {
|
|
alias /srv/footage/;
|
|
add_header Cache-Control "public, max-age=300, must-revalidate" always;
|
|
access_log off;
|
|
}
|
|
|
|
location /branding/ {
|
|
alias /srv/branding/;
|
|
add_header Cache-Control "public, max-age=300, must-revalidate" always;
|
|
access_log off;
|
|
}
|
|
|
|
location / {
|
|
proxy_pass http://nextjs;
|
|
proxy_set_header Host $host;
|
|
proxy_set_header X-Real-IP $remote_addr;
|
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
proxy_set_header X-Forwarded-Proto $scheme;
|
|
proxy_http_version 1.1;
|
|
proxy_set_header Upgrade $http_upgrade;
|
|
proxy_set_header Connection "upgrade";
|
|
}
|
|
}
|