use docker secrets for bbb

This commit is contained in:
Moritz 2022-12-06 14:47:29 +01:00 committed by Christian Galo
parent e19504af56
commit 1fd97150f7
3 changed files with 11 additions and 6 deletions

View File

@ -14,7 +14,8 @@ ADMIN_USER=admin
SECRET_DB_ROOT_PASSWORD_VERSION=v1 SECRET_DB_ROOT_PASSWORD_VERSION=v1
SECRET_DB_PASSWORD_VERSION=v1 SECRET_DB_PASSWORD_VERSION=v1
SECRET_ADMIN_PASSWORD_VERSION=v1 SECRET_ADMIN_PASSWORD_VERSION=v1
# SECRET_ONLYOFFICE_JWT_VERSION=v1 SECRET_ONLYOFFICE_JWT_VERSION=v1
SECRET_BBB_SECRET_VERSION=v1
EXTRA_VOLUME=/dev/null:/tmp/.dummy EXTRA_VOLUME=/dev/null:/tmp/.dummy
@ -22,3 +23,4 @@ EXTRA_VOLUME=/dev/null:/tmp/.dummy
# X_FRAME_OPTIONS_ALLOW_FROM=embedding-site.example.org # X_FRAME_OPTIONS_ALLOW_FROM=embedding-site.example.org
# APPS="calendar sociallogin onlyoffice" # APPS="calendar sociallogin onlyoffice"
# ONLYOFFICE_URL=https://onlyoffice.example.com # ONLYOFFICE_URL=https://onlyoffice.example.com
# BBB_URL=https://talk.example.org/bigbluebutton/ # trailing slash!

View File

@ -29,18 +29,16 @@ set_app_config(){
} }
install_bbb(){ install_bbb(){
URL=$1 # https://talk.example.org/bigbluebutton/ (trailing slash!)
SECRET=$2 # bbb secret key
install_apps bbb install_apps bbb
set_app_config bbb app.navigation true set_app_config bbb app.navigation true
set_app_config bbb api.url "$URL" set_app_config bbb api.url "$BBB_URL"
set_app_config bbb api.secret "$SECRET" set_app_config bbb api.secret "$(cat /run/secrets/bbb_secret)"
} }
install_onlyoffice(){ install_onlyoffice(){
install_apps onlyoffice install_apps onlyoffice
set_app_config onlyoffice DocumentServerUrl "$ONLYOFFICE_URL" set_app_config onlyoffice DocumentServerUrl "$ONLYOFFICE_URL"
set_app_config onlyoffice jwt_secret $(cat /run/secrets/onlyoffice_jwt) set_app_config onlyoffice jwt_secret "$(cat /run/secrets/onlyoffice_jwt)"
set_app_config onlyoffice customizationForcesave true set_app_config onlyoffice customizationForcesave true
} }

View File

@ -49,6 +49,7 @@ services:
- db_password - db_password
- admin_password - admin_password
- onlyoffice_jwt - onlyoffice_jwt
- bbb_secret
environment: environment:
- APPS - APPS
- X_FRAME_OPTIONS_ALLOW_FROM - X_FRAME_OPTIONS_ALLOW_FROM
@ -67,6 +68,7 @@ services:
- OVERWRITEPROTOCOL=https - OVERWRITEPROTOCOL=https
- PHP_MEMORY_LIMIT=1G - PHP_MEMORY_LIMIT=1G
- ONLYOFFICE_URL - ONLYOFFICE_URL
- BBB_URL
volumes: volumes:
- nextcloud:/var/www/html/ - nextcloud:/var/www/html/
- nextapps:/var/www/html/custom_apps:cached - nextapps:/var/www/html/custom_apps:cached
@ -116,6 +118,9 @@ 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}
volumes: volumes:
nextcloud: nextcloud: