Compare commits
7 Commits
0.2.9+v4.5
...
0.3.1+v5.1
| Author | SHA1 | Date | |
|---|---|---|---|
| 9f68524046 | |||
| 74b61b1154 | |||
| c9ca51a3da | |||
| deac2ea2ab | |||
| 4714d13b47 | |||
| ea3d6df830 | |||
| da526ffc3a |
34
.env.sample
34
.env.sample
@ -72,3 +72,37 @@ LOGGING_LEVEL_LOGGERS_APP=INFO
|
|||||||
##############################################################################
|
##############################################################################
|
||||||
# Set to false to disable automatic migrations on backend startup
|
# Set to false to disable automatic migrations on backend startup
|
||||||
# AUTO_MIGRATIONS=true
|
# 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
|
||||||
|
|||||||
34
compose.yml
34
compose.yml
@ -49,13 +49,27 @@ x-common-env: &common-env
|
|||||||
LOGOUT_REDIRECT_URL:
|
LOGOUT_REDIRECT_URL:
|
||||||
OIDC_REDIRECT_ALLOWED_HOSTS:
|
OIDC_REDIRECT_ALLOWED_HOSTS:
|
||||||
OIDC_AUTH_REQUEST_EXTRA_PARAMS:
|
OIDC_AUTH_REQUEST_EXTRA_PARAMS:
|
||||||
# AI (Fixme: remove?)
|
# AI
|
||||||
AI_FEATURE_ENABLED: "false"
|
AI_FEATURE_ENABLED: "false"
|
||||||
AI_BASE_URL: https://openaiendpoint.com
|
OPENAI_SDK_BASE_URL: https://openaiendpoint.com
|
||||||
AI_API_KEY: password
|
OPENAI_SDK_API_KEY: password
|
||||||
AI_MODEL: llama
|
AI_MODEL: llama
|
||||||
# Collaboration
|
# Collaboration
|
||||||
COLLABORATION_API_URL: https://$DOMAIN/collaboration/api/
|
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
|
x-postgres-env: &postgres-env
|
||||||
# Postgresql db container configuration
|
# Postgresql db container configuration
|
||||||
@ -84,14 +98,14 @@ x-minio-env: &minio-env
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: lasuite/impress-frontend:v4.5.0
|
image: lasuite/impress-frontend:v5.1.0
|
||||||
networks:
|
networks:
|
||||||
- backend
|
- backend
|
||||||
deploy:
|
deploy:
|
||||||
labels:
|
labels:
|
||||||
- "traefik.enable=false"
|
- "traefik.enable=false"
|
||||||
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
||||||
- "coop-cloud.${STACK_NAME}.version=0.2.9+v4.5.0"
|
- "coop-cloud.${STACK_NAME}.version=0.3.1+v5.1.0"
|
||||||
user: "${DOCKER_USER:-1000}"
|
user: "${DOCKER_USER:-1000}"
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "curl", "-f", "http://localhost:8080"]
|
test: ["CMD", "curl", "-f", "http://localhost:8080"]
|
||||||
@ -101,7 +115,7 @@ services:
|
|||||||
start_period: 10s
|
start_period: 10s
|
||||||
|
|
||||||
backend:
|
backend:
|
||||||
image: lasuite/impress-backend:v4.5.0
|
image: lasuite/impress-backend:v5.1.0
|
||||||
networks:
|
networks:
|
||||||
- backend
|
- backend
|
||||||
environment:
|
environment:
|
||||||
@ -136,7 +150,7 @@ services:
|
|||||||
- email_pass
|
- email_pass
|
||||||
|
|
||||||
celery:
|
celery:
|
||||||
image: lasuite/impress-backend:v4.5.0
|
image: lasuite/impress-backend:v5.1.0
|
||||||
networks:
|
networks:
|
||||||
- backend
|
- backend
|
||||||
healthcheck:
|
healthcheck:
|
||||||
@ -166,7 +180,7 @@ services:
|
|||||||
|
|
||||||
|
|
||||||
y-provider:
|
y-provider:
|
||||||
image: lasuite/impress-y-provider:v4.5.0
|
image: lasuite/impress-y-provider:v5.1.0
|
||||||
networks:
|
networks:
|
||||||
- backend
|
- backend
|
||||||
healthcheck:
|
healthcheck:
|
||||||
@ -212,7 +226,7 @@ services:
|
|||||||
- postgres_p
|
- postgres_p
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: redis:8.0.5
|
image: redis:8.2.6
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "redis-cli", "ping"]
|
test: ["CMD", "redis-cli", "ping"]
|
||||||
interval: 15s
|
interval: 15s
|
||||||
@ -252,7 +266,7 @@ services:
|
|||||||
- minio_ru
|
- minio_ru
|
||||||
|
|
||||||
web:
|
web:
|
||||||
image: nginx:1.29.5
|
image: nginx:1.30.0
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "curl", "-f", "http://localhost:8083"]
|
test: ["CMD", "curl", "-f", "http://localhost:8083"]
|
||||||
interval: 15s
|
interval: 15s
|
||||||
|
|||||||
Reference in New Issue
Block a user