Compare commits
12
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d07d52545e | ||
|
|
8becb1350e | ||
|
|
2b85f7e59c | ||
|
|
8e96ab1413 | ||
|
|
636ddb04bc | ||
|
|
1909869c2a | ||
|
|
4c4f878284 | ||
|
|
b340a80532 | ||
|
|
da9c3c2419 | ||
|
|
3d72f76acd
|
||
|
|
65668dcd1d
|
||
|
|
c57f6ab976 |
@@ -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
|
||||
|
||||
@@ -44,6 +44,34 @@ Then set the onlyoffice JWT secret from the onlyoffice installation:
|
||||
* `abra app secret insert <app-name> onlyoffice_jwt v1 <jwt_secret>`
|
||||
* `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
|
||||
|
||||
`abra app config <app-name>`
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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}
|
||||
@@ -2,7 +2,7 @@ version: "3.8"
|
||||
|
||||
services:
|
||||
elasticsearch:
|
||||
image: "docker.elastic.co/elasticsearch/elasticsearch:8.19.23"
|
||||
image: "docker.elastic.co/elasticsearch/elasticsearch:8.19.24"
|
||||
environment:
|
||||
- cluster.name=docker-cluster
|
||||
- bootstrap.memory_lock=true
|
||||
@@ -29,7 +29,7 @@ services:
|
||||
mode: 0600
|
||||
|
||||
searchindexer:
|
||||
image: nextcloud:33-fpm
|
||||
image: nextcloud:34.0.5-fpm
|
||||
volumes:
|
||||
- nextcloud:/var/www/html/
|
||||
- nextapps:/var/www/html/custom_apps:cached
|
||||
|
||||
@@ -6,7 +6,7 @@ services:
|
||||
- whiteboard_jwt
|
||||
|
||||
whiteboard:
|
||||
image: ghcr.io/nextcloud-releases/whiteboard:v2.0.0
|
||||
image: ghcr.io/nextcloud-releases/whiteboard:v2.1.2
|
||||
deploy:
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
|
||||
+5
-5
@@ -1,7 +1,7 @@
|
||||
version: "3.8"
|
||||
services:
|
||||
web:
|
||||
image: nginx:1.31.6
|
||||
image: nginx:1.31.8
|
||||
depends_on:
|
||||
- app
|
||||
configs:
|
||||
@@ -48,7 +48,7 @@ services:
|
||||
start_period: 5m
|
||||
|
||||
app:
|
||||
image: nextcloud:33-fpm
|
||||
image: nextcloud:34.0.5-fpm
|
||||
depends_on:
|
||||
- db
|
||||
configs:
|
||||
@@ -95,7 +95,7 @@ services:
|
||||
failure_action: rollback
|
||||
order: start-first
|
||||
labels:
|
||||
- "coop-cloud.${STACK_NAME}.version=14.5.1+33.0.9-fpm"
|
||||
- "coop-cloud.${STACK_NAME}.version=15.1.0+34.0.5-fpm"
|
||||
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT}"
|
||||
- "backupbot.backup=${ENABLE_BACKUPS:-true}"
|
||||
- "backupbot.backup.volumes.redis=false"
|
||||
@@ -109,7 +109,7 @@ services:
|
||||
start_period: 15m
|
||||
|
||||
cron:
|
||||
image: nextcloud:33-fpm
|
||||
image: nextcloud:34.0.5-fpm
|
||||
volumes:
|
||||
- nextcloud:/var/www/html/
|
||||
- nextapps:/var/www/html/custom_apps:cached
|
||||
@@ -125,7 +125,7 @@ services:
|
||||
|
||||
|
||||
cache:
|
||||
image: redis:8.10.2-alpine
|
||||
image: redis:8.10.3-alpine
|
||||
networks:
|
||||
- internal
|
||||
volumes:
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
Upgrades Nextcloud from 33 to 34 (major version upgrade).
|
||||
|
||||
IMPORTANT:
|
||||
- Do not skip major versions: your instance must be on the latest 33.x before
|
||||
upgrading to 34.
|
||||
- Use `check_major_upgrade` (`abra app cmd <app-name> 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> 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 adds support for Euro-Office, see the README.md for instructions.
|
||||
@@ -0,0 +1,2 @@
|
||||
This release is to have a "logical" update to make sure
|
||||
you know the php bug has been fixed.
|
||||
Reference in New Issue
Block a user