diff --git a/.env.sample b/.env.sample index 4405472..47ede50 100644 --- a/.env.sample +++ b/.env.sample @@ -69,6 +69,11 @@ DEFAULT_QUOTA="10 GB" # APPS="$APPS onlyoffice" # 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" # BBB_URL=https://talk.example.org/bigbluebutton/ # trailing slash! # SECRET_BBB_SECRET_VERSION=v1 diff --git a/README.md b/README.md index 1ecd2ca..e5501f1 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,34 @@ Then set the onlyoffice JWT secret from the onlyoffice installation: * `abra app secret insert onlyoffice_jwt v1 ` * `abra app cmd 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 ` + +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 euro_jwt v1 ` + +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 ` + +Once that is up and running, install the eurooffice plugin for nextcloud: + +`abra app cmd app install_eurooffice` + ### BBB Integration `abra app config ` diff --git a/abra.sh b/abra.sh index 00dda1d..d9788d2 100644 --- a/abra.sh +++ b/abra.sh @@ -84,6 +84,12 @@ install_onlyoffice() { 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_apps richdocuments set_app_config richdocuments wopi_url "$COLLABORA_URL" diff --git a/compose.eurooffice.yml b/compose.eurooffice.yml new file mode 100644 index 0000000..ade76b3 --- /dev/null +++ b/compose.eurooffice.yml @@ -0,0 +1,13 @@ +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} diff --git a/compose.fulltextsearch.yml b/compose.fulltextsearch.yml index 57addc2..89452fb 100644 --- a/compose.fulltextsearch.yml +++ b/compose.fulltextsearch.yml @@ -29,7 +29,7 @@ services: mode: 0600 searchindexer: - image: nextcloud:33.0.9-fpm + image: nextcloud:34.0.4-fpm volumes: - nextcloud:/var/www/html/ - nextapps:/var/www/html/custom_apps:cached diff --git a/compose.yml b/compose.yml index 583ad25..9f3ce8a 100644 --- a/compose.yml +++ b/compose.yml @@ -48,7 +48,7 @@ services: start_period: 5m app: - image: nextcloud:33.0.9-fpm + image: nextcloud:34.0.4-fpm depends_on: - db configs: @@ -109,7 +109,7 @@ services: start_period: 15m cron: - image: nextcloud:33.0.9-fpm + image: nextcloud:34.0.4-fpm volumes: - nextcloud:/var/www/html/ - nextapps:/var/www/html/custom_apps:cached diff --git a/release/next b/release/next new file mode 100644 index 0000000..69c8bd4 --- /dev/null +++ b/release/next @@ -0,0 +1,14 @@ +Upgrades Nextcloud from 33.0.9 to 34 (major version upgrade). + +IMPORTANT: +- Do not skip major versions: your instance must be on the latest 33.x before + upgrading to 34. If you are on an older 33.x, deploy 33.0.9 first. +- Use `check_major_upgrade` (`abra app cmd app check_major_upgrade`) + to check whether an instance is ready to upgrade to the next Nextcloud + major version. +- Nextcloud does NOT support downgrades. Take a backup before deploying. +- After deploying, check the logs and run any pending repair/upgrade steps: + `abra app cmd app run_occ '"app:update --all"'` +- Review app (plug-in) compatibility with Nextcloud 34 before upgrading; some + apps may need to be updated or temporarily disabled. +- This release has support for Euro-Office, see the README.md for instructions