diff --git a/.env.sample b/.env.sample index 131d164..9fc92ad 100644 --- a/.env.sample +++ b/.env.sample @@ -32,6 +32,9 @@ EXTRA_VOLUME=/dev/null:/tmp/.dummy # X_FRAME_OPTIONS_ENABLED=1 # X_FRAME_OPTIONS_ALLOW_FROM=embedding-site.example.org + +# COMPOSE_FILE="$COMPOSE_FILE:compose.apps.yml" # APPS="calendar sociallogin onlyoffice" # ONLYOFFICE_URL=https://onlyoffice.example.com # BBB_URL=https://talk.example.org/bigbluebutton/ # trailing slash! + diff --git a/compose.apps.yml b/compose.apps.yml new file mode 100644 index 0000000..b892636 --- /dev/null +++ b/compose.apps.yml @@ -0,0 +1,18 @@ +version: "3.8" +services: + app: + secrets: + - onlyoffice_jwt + - bbb_secret + environment: + - APPS + - ONLYOFFICE_URL + - BBB_URL + +secrets: + onlyoffice_jwt: + external: true + name: ${STACK_NAME}_onlyoffice_jwt_${SECRET_ONLYOFFICE_JWT_VERSION} + bbb_secret: + external: true + name: ${STACK_NAME}_bbb_secret_${SECRET_BBB_SECRET_VERSION} diff --git a/compose.yml b/compose.yml index c9f733e..ca80a7f 100644 --- a/compose.yml +++ b/compose.yml @@ -48,8 +48,6 @@ services: secrets: - db_password - admin_password - - onlyoffice_jwt - - bbb_secret environment: - APPS - X_FRAME_OPTIONS_ALLOW_FROM @@ -63,8 +61,6 @@ services: - REDIS_HOST=cache - OVERWRITEPROTOCOL=https - PHP_MEMORY_LIMIT=1G - - ONLYOFFICE_URL - - BBB_URL volumes: - nextcloud:/var/www/html/ - nextapps:/var/www/html/custom_apps:cached @@ -111,12 +107,6 @@ secrets: admin_password: external: true name: ${STACK_NAME}_admin_password_${SECRET_ADMIN_PASSWORD_VERSION} - onlyoffice_jwt: - external: true - name: ${STACK_NAME}_onlyoffice_jwt_${SECRET_ONLYOFFICE_JWT_VERSION} - bbb_secret: - external: true - name: ${STACK_NAME}_bbb_secret_${SECRET_BBB_SECRET_VERSION} volumes: nextcloud: diff --git a/releases/next b/releases/next index f55314a..112b1f9 100644 --- a/releases/next +++ b/releases/next @@ -12,3 +12,12 @@ Add SMTP Config to your .env file: # MAIL_DOMAIN= # SECRET_SMTP_PASSWORD_VERSION=v1 ``` + +Some Apps can also be managed with abra app cmd! + +``` +# COMPOSE_FILE="$COMPOSE_FILE:compose.apps.yml" +# APPS="calendar sociallogin onlyoffice" +# ONLYOFFICE_URL=https://onlyoffice.example.com +# BBB_URL=https://talk.example.org/bigbluebutton/ # trailing slash! +```