From 9f6852404693e54e61a6051a98d51955ae5baaa5 Mon Sep 17 00:00:00 2001 From: notplants Date: Mon, 18 May 2026 17:42:23 +0000 Subject: [PATCH] bump to 0.3.1+v5.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add env vars introduced upstream across v4.6 → v5.0: - CONVERSION_UPLOAD_ENABLED (v4.8.5) — recipe override true (upstream default false) - CONVERSION_FILE_MAX_SIZE / _EXTENSIONS_ALLOWED / _API_* (v4.5.0 source) - DB_PSYCOPG_POOL_ENABLED (v4.8.1) - DJANGO_EMAIL_URL_APP (v4.6.0) — recipe sets to https://${DOMAIN} - MEDIA_AUTH_ORIGINAL_URL_HEADER (v5.0.0) All except CONVERSION_UPLOAD_ENABLED and DJANGO_EMAIL_URL_APP use the bare-key defer-to-upstream pattern (like existing LOGGING_LEVEL_*), so upstream defaults apply unless the operator sets them in .env. Document all 10 vars (commented) in .env.sample. --- .env.sample | 34 ++++++++++++++++++++++++++++++++++ compose.yml | 16 +++++++++++++++- 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/.env.sample b/.env.sample index 43bd3d1..779ebcd 100644 --- a/.env.sample +++ b/.env.sample @@ -72,3 +72,37 @@ LOGGING_LEVEL_LOGGERS_APP=INFO ############################################################################## # Set to false to disable automatic migrations on backend startup # AUTO_MIGRATIONS=true + +############################################################################## +# CONVERSION (file upload → Yjs via y-provider) +############################################################################## +# Allow uploading .docx/.md files for conversion to Yjs. +# Recipe sets this to true (upstream default is false). +# CONVERSION_UPLOAD_ENABLED=true +# Upstream defaults (uncomment to override): +# CONVERSION_FILE_MAX_SIZE=20971520 +# CONVERSION_FILE_EXTENSIONS_ALLOWED=.docx,.md +# CONVERSION_API_ENDPOINT=convert +# CONVERSION_API_CONTENT_FIELD=content +# CONVERSION_API_TIMEOUT=30 +# CONVERSION_API_SECURE=false + +############################################################################## +# DATABASE CONNECTION POOL +############################################################################## +# Upstream default (uncomment to override): +# DB_PSYCOPG_POOL_ENABLED=false + +############################################################################## +# EMAIL APP URL +############################################################################## +# DJANGO_EMAIL_URL_APP is set automatically in compose.yml to https://${DOMAIN}. +# Override is not exposed via .env — edit compose.yml directly if needed. +# (Upstream default falls back to Django's Site framework, not configured here.) + +############################################################################## +# MEDIA AUTH HEADER +############################################################################## +# Header the backend reads for media auth subrequests. +# Upstream default matches the recipe's nginx config (X-Original-URL). +# MEDIA_AUTH_ORIGINAL_URL_HEADER=HTTP_X_ORIGINAL_URL diff --git a/compose.yml b/compose.yml index 0d43758..cd894ef 100644 --- a/compose.yml +++ b/compose.yml @@ -56,6 +56,20 @@ x-common-env: &common-env AI_MODEL: llama # Collaboration COLLABORATION_API_URL: https://$DOMAIN/collaboration/api/ + # Email app URL (used in email templates; matches recipe DOMAIN) + DJANGO_EMAIL_URL_APP: "https://${DOMAIN}" + # Conversion (file upload → Yjs via y-provider) + CONVERSION_UPLOAD_ENABLED: "${CONVERSION_UPLOAD_ENABLED:-true}" + CONVERSION_FILE_MAX_SIZE: + CONVERSION_FILE_EXTENSIONS_ALLOWED: + CONVERSION_API_ENDPOINT: + CONVERSION_API_CONTENT_FIELD: + CONVERSION_API_TIMEOUT: + CONVERSION_API_SECURE: + # Database connection pool + DB_PSYCOPG_POOL_ENABLED: + # Media auth header (matches recipe nginx by default) + MEDIA_AUTH_ORIGINAL_URL_HEADER: x-postgres-env: &postgres-env # Postgresql db container configuration @@ -91,7 +105,7 @@ services: labels: - "traefik.enable=false" - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" - - "coop-cloud.${STACK_NAME}.version=0.3.0+v5.1.0" + - "coop-cloud.${STACK_NAME}.version=0.3.1+v5.1.0" user: "${DOCKER_USER:-1000}" healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8080"] -- 2.49.0