Compare commits
3
Commits
main
..
version_34
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5b3036703f | ||
|
|
920edc252d | ||
|
|
542e980be0 |
@@ -69,11 +69,6 @@ DEFAULT_QUOTA="10 GB"
|
|||||||
# APPS="$APPS onlyoffice"
|
# APPS="$APPS onlyoffice"
|
||||||
# SECRET_ONLYOFFICE_JWT_VERSION=v1
|
# SECRET_ONLYOFFICE_JWT_VERSION=v1
|
||||||
|
|
||||||
# COMPOSE_FILE="$COMPOSE_FILE:compose.eurooffice.yml"
|
|
||||||
# EUROOFFICE_URL=https://euro-office.example.com
|
|
||||||
# APPS="$APPS eurooffice"
|
|
||||||
# SECRET_EURO_JWT_VERSION=v1
|
|
||||||
|
|
||||||
# COMPOSE_FILE="$COMPOSE_FILE:compose.bbb.yml"
|
# 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
|
||||||
|
|||||||
@@ -44,34 +44,6 @@ Then set the onlyoffice JWT secret from the onlyoffice installation:
|
|||||||
* `abra app secret insert <app-name> onlyoffice_jwt v1 <jwt_secret>`
|
* `abra app secret insert <app-name> onlyoffice_jwt v1 <jwt_secret>`
|
||||||
* `abra app cmd <app-name> app install_onlyoffice`
|
* `abra app cmd <app-name> app install_onlyoffice`
|
||||||
|
|
||||||
### Euro-Office Integration
|
|
||||||
|
|
||||||
First, deploy the [Euro-Office Recipe](https://recipes.coopcloud.tech/euro-office),
|
|
||||||
and keep its JWT secret. Then configure your nextcloud instance with:
|
|
||||||
|
|
||||||
`abra app config <app-name>`
|
|
||||||
|
|
||||||
Configure the following envs with the URL of the euro-office service:
|
|
||||||
```
|
|
||||||
COMPOSE_FILE="$COMPOSE_FILE:compose.eurooffice.yml"
|
|
||||||
EUROOFFICE_URL=https://euro-office.example.com
|
|
||||||
SECRET_EURO_JWT_VERSION=v1
|
|
||||||
```
|
|
||||||
|
|
||||||
Then set the euro-office JWT secret from the euro-office installation:
|
|
||||||
|
|
||||||
`abra app secret insert <app-name> euro_jwt v1 <jwt_secret>`
|
|
||||||
|
|
||||||
Now make sure that your nextcloud recipe is correctly deployed.
|
|
||||||
If it's a fresh install, deploy it, if Euro-Office is added after
|
|
||||||
the install, force-deploy it to update the configuration variables:
|
|
||||||
|
|
||||||
`abra app deploy -f <app-name>`
|
|
||||||
|
|
||||||
Once that is up and running, install the eurooffice plugin for nextcloud:
|
|
||||||
|
|
||||||
`abra app cmd <app-name> app install_eurooffice`
|
|
||||||
|
|
||||||
### BBB Integration
|
### BBB Integration
|
||||||
|
|
||||||
`abra app config <app-name>`
|
`abra app config <app-name>`
|
||||||
|
|||||||
@@ -84,12 +84,6 @@ install_onlyoffice() {
|
|||||||
set_app_config onlyoffice customizationForcesave true
|
set_app_config onlyoffice customizationForcesave true
|
||||||
}
|
}
|
||||||
|
|
||||||
install_eurooffice() {
|
|
||||||
install_apps eurooffice
|
|
||||||
set_app_config eurooffice DocumentServerUrl "$EUROOFFICE_URL"
|
|
||||||
set_app_config eurooffice jwt_secret "$(cat /run/secrets/euro_jwt)"
|
|
||||||
}
|
|
||||||
|
|
||||||
install_collabora() {
|
install_collabora() {
|
||||||
install_apps richdocuments
|
install_apps richdocuments
|
||||||
set_app_config richdocuments wopi_url "$COLLABORA_URL"
|
set_app_config richdocuments wopi_url "$COLLABORA_URL"
|
||||||
|
|||||||
@@ -1,13 +0,0 @@
|
|||||||
version: "3.8"
|
|
||||||
|
|
||||||
services:
|
|
||||||
app:
|
|
||||||
secrets:
|
|
||||||
- euro_jwt
|
|
||||||
environment:
|
|
||||||
- EUROOFFICE_URL
|
|
||||||
|
|
||||||
secrets:
|
|
||||||
euro_jwt:
|
|
||||||
external: true
|
|
||||||
name: ${STACK_NAME}_euro_jwt_${SECRET_EURO_JWT_VERSION}
|
|
||||||
@@ -29,7 +29,7 @@ services:
|
|||||||
mode: 0600
|
mode: 0600
|
||||||
|
|
||||||
searchindexer:
|
searchindexer:
|
||||||
image: nextcloud:34.0.4-fpm
|
image: nextcloud:34.0.5-fpm
|
||||||
volumes:
|
volumes:
|
||||||
- nextcloud:/var/www/html/
|
- nextcloud:/var/www/html/
|
||||||
- nextapps:/var/www/html/custom_apps:cached
|
- nextapps:/var/www/html/custom_apps:cached
|
||||||
|
|||||||
+2
-2
@@ -48,7 +48,7 @@ services:
|
|||||||
start_period: 5m
|
start_period: 5m
|
||||||
|
|
||||||
app:
|
app:
|
||||||
image: nextcloud:34.0.4-fpm
|
image: nextcloud:34.0.5-fpm
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
configs:
|
configs:
|
||||||
@@ -109,7 +109,7 @@ services:
|
|||||||
start_period: 15m
|
start_period: 15m
|
||||||
|
|
||||||
cron:
|
cron:
|
||||||
image: nextcloud:34.0.4-fpm
|
image: nextcloud:34.0.5-fpm
|
||||||
volumes:
|
volumes:
|
||||||
- nextcloud:/var/www/html/
|
- nextcloud:/var/www/html/
|
||||||
- nextapps:/var/www/html/custom_apps:cached
|
- nextapps:/var/www/html/custom_apps:cached
|
||||||
|
|||||||
+1
-2
@@ -1,4 +1,4 @@
|
|||||||
Upgrades Nextcloud from 33.0.9 to 34 (major version upgrade).
|
Upgrades Nextcloud from 33 to 34 (major version upgrade).
|
||||||
|
|
||||||
IMPORTANT:
|
IMPORTANT:
|
||||||
- Do not skip major versions: your instance must be on the latest 33.x before
|
- Do not skip major versions: your instance must be on the latest 33.x before
|
||||||
@@ -11,4 +11,3 @@ IMPORTANT:
|
|||||||
`abra app cmd <app> app run_occ '"app:update --all"'`
|
`abra app cmd <app> app run_occ '"app:update --all"'`
|
||||||
- Review app (plug-in) compatibility with Nextcloud 34 before upgrading; some
|
- Review app (plug-in) compatibility with Nextcloud 34 before upgrading; some
|
||||||
apps may need to be updated or temporarily disabled.
|
apps may need to be updated or temporarily disabled.
|
||||||
- This release has support for Euro-Office, see the README.md for instructions
|
|
||||||
|
|||||||
Reference in New Issue
Block a user