From 1865844260afce6cebfcc7256bb55f0a9007c503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Kr=C3=BCger?= Date: Thu, 5 Mar 2026 09:51:40 +0100 Subject: [PATCH] chore: cleanup --- gitea/runner-config.yaml | 2 +- sexy/compose.yml | 75 +++++++++++++++++----------------------- traefik/compose.yml | 2 +- 3 files changed, 33 insertions(+), 46 deletions(-) diff --git a/gitea/runner-config.yaml b/gitea/runner-config.yaml index 8ebdecb..59c0007 100644 --- a/gitea/runner-config.yaml +++ b/gitea/runner-config.yaml @@ -3,7 +3,7 @@ log: runner: file: .runner - capacity: 1 + capacity: 4 envs: {} env_file: .env timeout: 3h diff --git a/sexy/compose.yml b/sexy/compose.yml index 93ae93d..767dcd3 100644 --- a/sexy/compose.yml +++ b/sexy/compose.yml @@ -13,8 +13,6 @@ services: PUBLIC_URL: https://${TRAEFIK_HOST} PUBLIC_UMAMI_ID: ${UMAMI_ID} PUBLIC_UMAMI_SCRIPT: ${UMAMI_SCRIPT} - volumes: - - ../.data/sexy/bundle:/home/node/app/packages/bundle restart: always labels: - "traefik.enable=true" @@ -32,41 +30,30 @@ services: - "com.centurylinklabs.watchtower.enable=true" networks: - compose_network - directus: - image: directus/directus:11 - container_name: sexy_directus + backend: + image: dev.pivoine.art/valknar/sexy-backend:latest + container_name: sexy_backend environment: TZ: ${TIMEZONE:-Europe/Amsterdam} - SECRET: ${DIRECTUS_SECRET} - DB_CLIENT: pg - DB_HOST: sexy_db - DB_PORT: 5432 - DB_DATABASE: directus - DB_USER: directus - DB_PASSWORD: directus - CACHE_ENABLED: "true" - CACHE_AUTO_PURGE: "true" - CACHE_STORE: redis - REDIS: redis://sexy_redis:6379 - ASSETS_CACHE_TTL: "31536000" - WEBSOCKETS_ENABLED: "true" - PUBLIC_URL: https://${TRAEFIK_HOST}/api - CORS_ENABLED: "true" + NODE_ENV: production + PORT: 4000 + DATABASE_URL: postgresql://${DB_USER:-sexy}:${DB_PASSWORD:-sexy}@sexy_db:5432/${DB_NAME:-sexy} + REDIS_URL: redis://sexy_redis:6379 + UPLOAD_DIR: /data/uploads CORS_ORIGIN: https://${TRAEFIK_HOST} + COOKIE_SECRET: ${COOKIE_SECRET} SESSION_COOKIE_SECURE: "true" SESSION_COOKIE_SAME_SITE: strict SESSION_COOKIE_DOMAIN: ${TRAEFIK_HOST} - EXTENSIONS_PATH: ./extensions - EXTENSIONS_AUTO_RELOAD: "false" - CONTENT_SECURITY_POLICY_DIRECTIVES__FRAME_SRC: https://${TRAEFIK_HOST} - EMAIL_TRANSPORT: smtp - EMAIL_SMTP_HOST: mailpit - EMAIL_SMTP_PORT: 1025 - USER_REGISTER_URL_ALLOW_LIST: https://${TRAEFIK_HOST}/signup/verify - PASSWORD_RESET_URL_ALLOW_LIST: https://${TRAEFIK_HOST}/password/reset + PUBLIC_URL: https://${TRAEFIK_HOST} + SMTP_HOST: ${SMTP_HOST:-mailpit} + SMTP_PORT: ${SMTP_PORT:-1025} + SMTP_SECURE: ${SMTP_SECURE:-false} + SMTP_USER: ${SMTP_USER:-} + SMTP_PASS: ${SMTP_PASS:-} + EMAIL_FROM: ${EMAIL_FROM:-noreply@sexy.pivoine.art} volumes: - - ../.data/sexy/uploads:/directus/uploads - - ../.data/sexy/bundle:/directus/extensions/sexy.pivoine.art + - ../.data/sexy/uploads:/data/uploads depends_on: db: condition: service_healthy @@ -75,17 +62,17 @@ services: restart: always labels: - "traefik.enable=true" - - "traefik.http.middlewares.sexy-directus-redirect-web-secure.redirectscheme.scheme=https" - - "traefik.http.routers.sexy-directus-web.middlewares=sexy-directus-redirect-web-secure" - - "traefik.http.routers.sexy-directus-web.rule=Host(`${TRAEFIK_HOST}`) && PathPrefix(`/api`)" - - "traefik.http.routers.sexy-directus-web.entrypoints=web" - - "traefik.http.routers.sexy-directus-web-secure.rule=Host(`${TRAEFIK_HOST}`) && PathPrefix(`/api`)" - - "traefik.http.routers.sexy-directus-web-secure.tls.certresolver=resolver" - - "traefik.http.routers.sexy-directus-web-secure.entrypoints=web-secure" - - "traefik.http.middlewares.sexy-directus-compress.compress=true" - - "traefik.http.middlewares.sexy-directus-strip.stripprefix.prefixes=/api" - - "traefik.http.routers.sexy-directus-web-secure.middlewares=sexy-directus-strip,sexy-directus-compress" - - "traefik.http.services.sexy-directus-web-secure.loadbalancer.server.port=8055" + - "traefik.http.middlewares.sexy-backend-redirect-web-secure.redirectscheme.scheme=https" + - "traefik.http.routers.sexy-backend-web.middlewares=sexy-backend-redirect-web-secure" + - "traefik.http.routers.sexy-backend-web.rule=Host(`${TRAEFIK_HOST}`) && PathPrefix(`/api`)" + - "traefik.http.routers.sexy-backend-web.entrypoints=web" + - "traefik.http.routers.sexy-backend-web-secure.rule=Host(`${TRAEFIK_HOST}`) && PathPrefix(`/api`)" + - "traefik.http.routers.sexy-backend-web-secure.tls.certresolver=resolver" + - "traefik.http.routers.sexy-backend-web-secure.entrypoints=web-secure" + - "traefik.http.middlewares.sexy-backend-strip.stripprefix.prefixes=/api" + - "traefik.http.middlewares.sexy-backend-compress.compress=true" + - "traefik.http.routers.sexy-backend-web-secure.middlewares=sexy-backend-strip,sexy-backend-compress" + - "traefik.http.services.sexy-backend-web-secure.loadbalancer.server.port=4000" - "traefik.docker.network=${NETWORK_NAME}" - "com.centurylinklabs.watchtower.enable=true" networks: @@ -105,9 +92,9 @@ services: image: postgres:16-alpine container_name: sexy_db environment: - POSTGRES_DB: directus - POSTGRES_USER: directus - POSTGRES_PASSWORD: directus + POSTGRES_DB: ${DB_NAME:-sexy} + POSTGRES_USER: ${DB_USER:-sexy} + POSTGRES_PASSWORD: ${DB_PASSWORD:-sexy} volumes: - ../.data/sexy/db:/var/lib/postgresql/data restart: always diff --git a/traefik/compose.yml b/traefik/compose.yml index fd9c14d..9e7fd07 100644 --- a/traefik/compose.yml +++ b/traefik/compose.yml @@ -1,7 +1,7 @@ --- services: traefik: - image: traefik:v3 + image: traefik:latest container_name: traefik command: - "--api.dashboard=false"