Compare commits

...

2 Commits

Author SHA1 Message Date
c056687849 chore: publish 7.0.3+29.0.1-fpm release 2024-06-19 18:35:19 +02:00
180c269337 Revert "split bbb and onlyoffice compose.yml"
This reverts commit 9be859db25.
Accidentally introduced a breaking change into a patch release
2024-06-19 18:34:02 +02:00
5 changed files with 20 additions and 29 deletions

View File

@ -44,28 +44,26 @@ DEFAULT_QUOTA="10 GB"
# MAIL_DOMAIN= # MAIL_DOMAIN=
# SECRET_SMTP_PASSWORD_VERSION=v1 # SECRET_SMTP_PASSWORD_VERSION=v1
# APPS="calendar" # COMPOSE_FILE="$COMPOSE_FILE:compose.apps.yml"
# APPS="calendar sociallogin onlyoffice"
# COLLABORA_URL=https://collabora.example.com #
# COMPOSE_FILE="$COMPOSE_FILE:compose.onlyoffice.yml"
# ONLYOFFICE_URL=https://onlyoffice.example.com # ONLYOFFICE_URL=https://onlyoffice.example.com
# APPS="$APPS onlyoffice"
# SECRET_ONLYOFFICE_JWT_VERSION=v1 # SECRET_ONLYOFFICE_JWT_VERSION=v1
#
# COMPOSE_FILE="$COMPOSE_FILE:compose.bbb.yml" # COLLABORA_URL=https://collabora.example.com
#
# BBB_URL=https://talk.example.org/bigbluebutton/ # trailing slash! # BBB_URL=https://talk.example.org/bigbluebutton/ # trailing slash!
# SECRET_BBB_SECRET_VERSION=v1 # SECRET_BBB_SECRET_VERSION=v1
#
# COMPOSE_FILE="$COMPOSE_FILE:compose.authentik.yml"
# APPS="$APPS sociallogin"
# AUTHENTIK_USER_PREFIX=authentik
# AUTHENTIK_DOMAIN=authentik.example.com
# SECRET_AUTHENTIK_SECRET_VERSION=v1
# SECRET_AUTHENTIK_ID_VERSION=v1
# OCC_CMDS="app:disable dashboard" # OCC_CMDS="app:disable dashboard"
# OCC_CMDS="$OCC_CMDS|config:app:set sociallogin auto_create_groups --value 1" # OCC_CMDS="$OCC_CMDS|config:app:set sociallogin auto_create_groups --value 1"
# OCC_CMDS="$OCC_CMDS|config:app:set sociallogin hide_default_login --value 1" # OCC_CMDS="$OCC_CMDS|config:app:set sociallogin hide_default_login --value 1"
# COMPOSE_FILE="$COMPOSE_FILE:compose.authentik.yml"
# AUTHENTIK_USER_PREFIX=authentik
# AUTHENTIK_DOMAIN=authentik.example.com
# SECRET_AUTHENTIK_SECRET_VERSION=v1
# SECRET_AUTHENTIK_ID_VERSION=v1
#COMPOSE_FILE="$COMPOSE_FILE:compose.fulltextsearch.yml" #COMPOSE_FILE="$COMPOSE_FILE:compose.fulltextsearch.yml"
#SECRET_ELASTICSEARCH_PASSWORD_VERSION=v1 #SECRET_ELASTICSEARCH_PASSWORD_VERSION=v1

View File

@ -12,7 +12,6 @@ authentik:
nextcloud_id: authentik_id nextcloud_id: authentik_id
onlyoffice: onlyoffice:
uncomment: uncomment:
- compose.onlyoffice.yml
- ONLYOFFICE_URL - ONLYOFFICE_URL
- SECRET_ONLYOFFICE_JWT_VERSION - SECRET_ONLYOFFICE_JWT_VERSION
execute: execute:

View File

@ -3,10 +3,16 @@ services:
app: app:
secrets: secrets:
- onlyoffice_jwt - onlyoffice_jwt
- bbb_secret
environment: environment:
- APPS
- ONLYOFFICE_URL - ONLYOFFICE_URL
- BBB_URL
secrets: secrets:
onlyoffice_jwt: onlyoffice_jwt:
external: true external: true
name: ${STACK_NAME}_onlyoffice_jwt_${SECRET_ONLYOFFICE_JWT_VERSION} name: ${STACK_NAME}_onlyoffice_jwt_${SECRET_ONLYOFFICE_JWT_VERSION}
bbb_secret:
external: true
name: ${STACK_NAME}_bbb_secret_${SECRET_BBB_SECRET_VERSION}

View File

@ -1,12 +0,0 @@
version: "3.8"
services:
app:
secrets:
- bbb_secret
environment:
- BBB_URL
secrets:
bbb_secret:
external: true
name: ${STACK_NAME}_bbb_secret_${SECRET_BBB_SECRET_VERSION}

View File

@ -91,7 +91,7 @@ services:
failure_action: rollback failure_action: rollback
order: start-first order: start-first
labels: labels:
- "coop-cloud.${STACK_NAME}.version=7.0.2+29.0.1-fpm" - "coop-cloud.${STACK_NAME}.version=7.0.3+29.0.1-fpm"
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
- "backupbot.backup=true" - "backupbot.backup=true"
- "backupbot.backup.path=/var/www/html/config/,/var/www/html/data/,/var/www/html/custom_apps/" - "backupbot.backup.path=/var/www/html/config/,/var/www/html/data/,/var/www/html/custom_apps/"