forked from coop-cloud/nextcloud
Compare commits
3 Commits
6.0.3+28.0
...
split-bbb-
Author | SHA1 | Date | |
---|---|---|---|
f4edb06d53 | |||
0a3e943b26 | |||
4f1aaf5d1d |
24
.env.sample
24
.env.sample
@ -44,26 +44,28 @@ DEFAULT_QUOTA="10 GB"
|
|||||||
# MAIL_DOMAIN=
|
# MAIL_DOMAIN=
|
||||||
# SECRET_SMTP_PASSWORD_VERSION=v1
|
# SECRET_SMTP_PASSWORD_VERSION=v1
|
||||||
|
|
||||||
# COMPOSE_FILE="$COMPOSE_FILE:compose.apps.yml"
|
# APPS="calendar"
|
||||||
# APPS="calendar sociallogin onlyoffice"
|
|
||||||
#
|
|
||||||
# ONLYOFFICE_URL=https://onlyoffice.example.com
|
|
||||||
# SECRET_ONLYOFFICE_JWT_VERSION=v1
|
|
||||||
#
|
|
||||||
# COLLABORA_URL=https://collabora.example.com
|
# COLLABORA_URL=https://collabora.example.com
|
||||||
#
|
|
||||||
|
# COMPOSE_FILE="$COMPOSE_FILE:compose.onlyoffice.yml"
|
||||||
|
# ONLYOFFICE_URL=https://onlyoffice.example.com
|
||||||
|
# APPS="$APPS onlyoffice"
|
||||||
|
# SECRET_ONLYOFFICE_JWT_VERSION=v1
|
||||||
|
|
||||||
|
# COMPOSE_FILE="$COMPOSE_FILE:compose.bbb.yml"
|
||||||
# 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
|
||||||
#
|
|
||||||
# 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 hide_default_login --value 1"
|
|
||||||
|
|
||||||
# COMPOSE_FILE="$COMPOSE_FILE:compose.authentik.yml"
|
# COMPOSE_FILE="$COMPOSE_FILE:compose.authentik.yml"
|
||||||
|
# APPS="$APPS sociallogin"
|
||||||
# AUTHENTIK_USER_PREFIX=authentik
|
# AUTHENTIK_USER_PREFIX=authentik
|
||||||
# AUTHENTIK_DOMAIN=authentik.example.com
|
# AUTHENTIK_DOMAIN=authentik.example.com
|
||||||
# SECRET_AUTHENTIK_SECRET_VERSION=v1
|
# SECRET_AUTHENTIK_SECRET_VERSION=v1
|
||||||
# SECRET_AUTHENTIK_ID_VERSION=v1
|
# SECRET_AUTHENTIK_ID_VERSION=v1
|
||||||
|
# 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 hide_default_login --value 1"
|
||||||
|
|
||||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.fulltextsearch.yml"
|
#COMPOSE_FILE="$COMPOSE_FILE:compose.fulltextsearch.yml"
|
||||||
#SECRET_ELASTICSEARCH_PASSWORD_VERSION=v1
|
#SECRET_ELASTICSEARCH_PASSWORD_VERSION=v1
|
||||||
|
1
abra.sh
1
abra.sh
@ -4,6 +4,7 @@ export FPM_TUNE_VERSION=v5
|
|||||||
export NGINX_CONF_VERSION=v6
|
export NGINX_CONF_VERSION=v6
|
||||||
export MY_CNF_VERSION=v5
|
export MY_CNF_VERSION=v5
|
||||||
export ENTRYPOINT_VERSION=v3
|
export ENTRYPOINT_VERSION=v3
|
||||||
|
export CRONTAB_VERSION=v1
|
||||||
|
|
||||||
run_occ() {
|
run_occ() {
|
||||||
su -p www-data -s /bin/sh -c "/var/www/html/occ $@"
|
su -p www-data -s /bin/sh -c "/var/www/html/occ $@"
|
||||||
|
12
compose.bbb.yml
Normal file
12
compose.bbb.yml
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
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}
|
@ -3,16 +3,10 @@ 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}
|
|
@ -91,7 +91,7 @@ services:
|
|||||||
failure_action: rollback
|
failure_action: rollback
|
||||||
order: start-first
|
order: start-first
|
||||||
labels:
|
labels:
|
||||||
- "coop-cloud.${STACK_NAME}.version=6.0.3+28.0.5-fpm"
|
- "coop-cloud.${STACK_NAME}.version=6.0.5+28.0.5-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/"
|
||||||
@ -113,6 +113,10 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
- internal
|
- internal
|
||||||
entrypoint: /cron.sh
|
entrypoint: /cron.sh
|
||||||
|
configs:
|
||||||
|
- source: crontab
|
||||||
|
target: /var/spool/cron/crontabs/www-data
|
||||||
|
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
image: redis:7.2.4-alpine
|
image: redis:7.2.4-alpine
|
||||||
@ -155,6 +159,9 @@ configs:
|
|||||||
name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION}
|
name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION}
|
||||||
file: entrypoint.sh.tmpl
|
file: entrypoint.sh.tmpl
|
||||||
template_driver: golang
|
template_driver: golang
|
||||||
|
crontab:
|
||||||
|
name: ${STACK_NAME}_crontab_${CRONTAB_VERSION}
|
||||||
|
file: crontab
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
proxy:
|
proxy:
|
||||||
|
1
crontab
Normal file
1
crontab
Normal file
@ -0,0 +1 @@
|
|||||||
|
*/5 * * * * php -d memory_limit=1G -f /var/www/html/cron.php
|
1
release/6.0.5+28.0.5-fpm
Normal file
1
release/6.0.5+28.0.5-fpm
Normal file
@ -0,0 +1 @@
|
|||||||
|
BREAKING CHANGE: compose.apps.yml was split to compose.bbb.yml and compose.onlyoffice.yml, configuration update is required!
|
Reference in New Issue
Block a user