e1ec082e50
Task #534 — backend, infra, tooling. UI ships in Stage 2 (#535). Backend - New system_settings table (id=1 singleton): installed flag, base_url, local_domain, local_ip, https_mode, app_version. Pushed to dev DB. - New /api/setup/status (open) and /api/setup/{validate,complete} (gated by requireSetupOpen — 409 once installed). - completeInstall is fully transactional: pg_advisory_xact_lock serializes concurrent callers, double-gates on installed flag and admin existence, then atomically creates the admin user, assigns admin role + Admins/Everyone groups, and flips system_settings to installed=true. Rolls back on any failure. - Added redirectIfSetupNeeded() helper returning the full SetupStatus payload alongside a redirect target for SPA routing decisions. - Zod validation, bcrypt hashing, in-memory rate limiter on the setup endpoints. Backward compat - scripts/src/seed.ts now branches on installed flag + admin existence + SEED_*_PASSWORD env vars. Legacy installs (admin exists, system_settings empty) get backfilled to installed=true via ON CONFLICT DO UPDATE so they are never forced through the wizard. When env passwords are unset and no admin exists, the seed prints a wizard hint instead of seeding. Infra - docker-compose.yml: replaced nginx edge with a Caddy service that mounts ./certs and ./docker/Caddyfile{,.skip}. The web service no longer publishes a port directly — Caddy is the only public ingress. - Caddy entrypoint picks Caddyfile.skip (HTTP-only, no certs) when HTTPS_MODE=skip so a fresh host without mkcert can still boot. - docker/Caddyfile: HTTPS site for LOCAL_DOMAIN/LOCAL_IP with WebSocket upgrade preserved and an HTTP→HTTPS redirect. - start.sh: preserved. Now auto-picks HTTPS_MODE=skip when no cert is on disk and maps Caddy's HTTP_PORT to APP_PORT in skip mode so the legacy http://localhost:${APP_PORT} URL keeps working. In local/byo mode it prints the https://${LOCAL_DOMAIN} URL. - .env.example: added LOCAL_DOMAIN, LOCAL_IP, BASE_URL, HTTP_PORT, HTTPS_PORT, HTTPS_MODE; SEED_*_PASSWORD now optional. Tooling - scripts/local-setup.sh: idempotent OS-aware bootstrap (.env upsert, mkcert hint, cert SAN check, dry-run via LOCAL_SETUP_DRY_RUN). Tests - artifacts/api-server/tests/setup-wizard.test.mjs: 7/7 pass. - scripts/tests/local-setup.test.mjs: 2/2 pass. Constraints honored: no force-push, no destructive ops, start.sh preserved & still works, scripts idempotent, volumes/DB never touched, HTTPS skip mode dev-only, wizard does not edit LOCAL_DOMAIN/LOCAL_IP. Out of scope / not addressed: pre-existing TS errors in routes/users.ts and pre-existing failure in executive-meetings-postpone-race.test.mjs.
134 lines
4.6 KiB
YAML
134 lines
4.6 KiB
YAML
name: tx-os
|
|
|
|
services:
|
|
postgres:
|
|
image: postgres:16-alpine
|
|
restart: unless-stopped
|
|
environment:
|
|
POSTGRES_USER: ${POSTGRES_USER:-tx}
|
|
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-tx_dev_password}
|
|
POSTGRES_DB: ${POSTGRES_DB:-tx}
|
|
volumes:
|
|
- postgres_data:/var/lib/postgresql/data
|
|
healthcheck:
|
|
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-tx} -d ${POSTGRES_DB:-tx}"]
|
|
interval: 5s
|
|
timeout: 5s
|
|
retries: 20
|
|
|
|
migrate:
|
|
build:
|
|
context: .
|
|
dockerfile: docker/api-server.Dockerfile
|
|
image: tx-os/api-server:latest
|
|
depends_on:
|
|
postgres:
|
|
condition: service_healthy
|
|
environment:
|
|
NODE_ENV: production
|
|
DATABASE_URL: postgres://${POSTGRES_USER:-tx}:${POSTGRES_PASSWORD:-tx_dev_password}@postgres:5432/${POSTGRES_DB:-tx}
|
|
# Seed passwords are now optional. When unset, the seed script
|
|
# creates roles/permissions only and leaves admin creation to
|
|
# the first-run Setup Wizard (/api/setup/complete).
|
|
SEED_ADMIN_PASSWORD: ${SEED_ADMIN_PASSWORD:-}
|
|
SEED_USER_PASSWORD: ${SEED_USER_PASSWORD:-}
|
|
PUBLIC_BASE_URL: ${PUBLIC_BASE_URL:-http://localhost:${APP_PORT:-3000}}
|
|
user: root
|
|
entrypoint: ["/usr/bin/tini", "--"]
|
|
command: ["/bin/bash", "/usr/local/bin/migrate.sh"]
|
|
restart: "no"
|
|
|
|
api:
|
|
build:
|
|
context: .
|
|
dockerfile: docker/api-server.Dockerfile
|
|
image: tx-os/api-server:latest
|
|
restart: unless-stopped
|
|
depends_on:
|
|
postgres:
|
|
condition: service_healthy
|
|
migrate:
|
|
condition: service_completed_successfully
|
|
environment:
|
|
NODE_ENV: production
|
|
PORT: 8080
|
|
DATABASE_URL: postgres://${POSTGRES_USER:-tx}:${POSTGRES_PASSWORD:-tx_dev_password}@postgres:5432/${POSTGRES_DB:-tx}
|
|
SESSION_SECRET: ${SESSION_SECRET:?SESSION_SECRET is required — copy .env.docker.example to .env and edit it}
|
|
LOCAL_STORAGE_SIGNING_SECRET: ${LOCAL_STORAGE_SIGNING_SECRET:-${SESSION_SECRET}}
|
|
LOCAL_STORAGE_ROOT: /app/storage
|
|
STORAGE_DRIVER: ${STORAGE_DRIVER:-local}
|
|
PRIVATE_OBJECT_DIR: ${PRIVATE_OBJECT_DIR:-/app/storage/private}
|
|
PUBLIC_OBJECT_SEARCH_PATHS: ${PUBLIC_OBJECT_SEARCH_PATHS:-/app/storage/public}
|
|
DEFAULT_OBJECT_STORAGE_BUCKET_ID: ${DEFAULT_OBJECT_STORAGE_BUCKET_ID:-tx-local}
|
|
ALLOWED_ORIGINS: ${ALLOWED_ORIGINS:-http://localhost:${APP_PORT:-3000}}
|
|
PUBLIC_BASE_URL: ${PUBLIC_BASE_URL:-http://localhost:${APP_PORT:-3000}}
|
|
LOG_LEVEL: ${LOG_LEVEL:-info}
|
|
HTTPS_MODE: ${HTTPS_MODE:-local}
|
|
LOCAL_DOMAIN: ${LOCAL_DOMAIN:-}
|
|
LOCAL_IP: ${LOCAL_IP:-}
|
|
SMTP_HOST: ${SMTP_HOST:-}
|
|
SMTP_PORT: ${SMTP_PORT:-}
|
|
SMTP_USER: ${SMTP_USER:-}
|
|
SMTP_PASS: ${SMTP_PASS:-}
|
|
SMTP_FROM: ${SMTP_FROM:-}
|
|
SMTP_SECURE: ${SMTP_SECURE:-}
|
|
volumes:
|
|
- app_storage:/app/storage
|
|
|
|
web:
|
|
build:
|
|
context: .
|
|
dockerfile: docker/tx-os.Dockerfile
|
|
image: tx-os/web:latest
|
|
restart: unless-stopped
|
|
depends_on:
|
|
- api
|
|
# No host port binding — Caddy is the single public edge.
|
|
expose:
|
|
- "80"
|
|
|
|
caddy:
|
|
image: caddy:2.8-alpine
|
|
restart: unless-stopped
|
|
depends_on:
|
|
- api
|
|
- web
|
|
environment:
|
|
LOCAL_DOMAIN: ${LOCAL_DOMAIN:-tx.local}
|
|
LOCAL_IP: ${LOCAL_IP:-127.0.0.1}
|
|
HTTPS_MODE: ${HTTPS_MODE:-local}
|
|
# Pick the Caddyfile at boot. We auto-fall-back to the cert-free
|
|
# Caddyfile.skip when HTTPS_MODE=skip OR when /certs is missing
|
|
# the keypair, so a fresh `./start.sh` works on hosts that don't
|
|
# have mkcert without any extra wiring.
|
|
entrypoint:
|
|
- /bin/sh
|
|
- -c
|
|
- |
|
|
if [ "$${HTTPS_MODE}" = "skip" ] || [ ! -f /certs/local-cert.pem ] || [ ! -f /certs/local-key.pem ]; then
|
|
exec caddy run --config /etc/caddy/Caddyfile.skip --adapter caddyfile
|
|
else
|
|
exec caddy run --config /etc/caddy/Caddyfile --adapter caddyfile
|
|
fi
|
|
ports:
|
|
# HTTP edge: defaults to APP_PORT so the legacy http://localhost:${APP_PORT}
|
|
# URL keeps working without modifying start.sh.
|
|
- "${HTTP_PORT:-${APP_PORT:-3000}}:80"
|
|
# HTTPS edge: bound to localhost on a non-privileged port by
|
|
# default so it never fights with another service on :443 and
|
|
# never requires root to bind. local-setup.sh writes
|
|
# HTTPS_BIND=0.0.0.0:443 (or :443) to .env once mkcert has run.
|
|
- "${HTTPS_BIND:-127.0.0.1:8443}:443"
|
|
volumes:
|
|
- ./docker/Caddyfile:/etc/caddy/Caddyfile:ro
|
|
- ./docker/Caddyfile.skip:/etc/caddy/Caddyfile.skip:ro
|
|
- ./certs:/certs:ro
|
|
- caddy_data:/data
|
|
- caddy_config:/config
|
|
|
|
volumes:
|
|
postgres_data:
|
|
app_storage:
|
|
caddy_data:
|
|
caddy_config:
|