Compare commits

..
Author SHA1 Message Date
Linus Gasser 0e2d8484ee Mitigation for PHP CVE
This includes the mitigations proposed by
https://www.php.net/archive/2026.php#2026-10-21-5
2026-10-21 16:19:16 +02:00
renovate-bot b340a80532 chore(deps): update nginx docker tag to v1.31.7 2026-10-18 19:22:20 +00:00
dannygroenewegen da9c3c2419 chore: publish 15.0.0+34.0.5-fpm release
continuous-integration/drone/tag Build is passing
2026-10-18 12:27:04 +02:00
Linus Gasser 3d72f76acd Adding EuroOffice
This PR adds the EuroOffice integration to Nextcloud.
2026-10-18 12:22:35 +02:00
Linus Gasser 65668dcd1d Moving to version 34.0.5
Updates to the next major version.
EuroOffice comes in a next commit.
2026-10-18 12:05:35 +02:00
dannygroenewegen c57f6ab976 chore: publish 14.6.0+33-fpm release
continuous-integration/drone/tag Build is passing
2026-10-18 11:57:29 +02:00
Linus Gasser 920edc252d Rolling release of version 33
This is the rolling release of version 33 of nextcloud.
2026-10-17 14:08:40 +02:00
Linus Gasser 542e980be0 Revert "Moving to latest nextcloud 34 release"
This is so we can release a "rolling release" of
nextcloud version 33.
2026-10-17 14:05:07 +02:00
Linus Gasser 9d25f7ee3c Moving to latest nextcloud 34 release
This release adds the configuration and documentation to use
Euro-Office for nextcloud.
2026-10-08 07:39:16 +00:00
10 changed files with 87 additions and 6 deletions
+5
View File
@@ -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
+28
View File
@@ -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>`
+7 -1
View File
@@ -1,6 +1,6 @@
#!/bin/bash
export FPM_TUNE_VERSION=v5
export FPM_TUNE_VERSION=v6
export NGINX_CONF_VERSION=v9
export MY_CNF_VERSION=v6
export ENTRYPOINT_VERSION=v3
@@ -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"
+13
View File
@@ -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}
+1 -1
View File
@@ -29,7 +29,7 @@ services:
mode: 0600
searchindexer:
image: nextcloud:33.0.9-fpm
image: nextcloud:34.0.5-fpm
volumes:
- nextcloud:/var/www/html/
- nextapps:/var/www/html/custom_apps:cached
+4 -4
View File
@@ -1,7 +1,7 @@
version: "3.8"
services:
web:
image: nginx:1.31.6
image: nginx:1.31.7
depends_on:
- app
configs:
@@ -48,7 +48,7 @@ services:
start_period: 5m
app:
image: nextcloud:33.0.9-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.0.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.0.9-fpm
image: nextcloud:34.0.5-fpm
volumes:
- nextcloud:/var/www/html/
- nextapps:/var/www/html/custom_apps:cached
+9
View File
@@ -1,5 +1,14 @@
[www]
pm = dynamic
pm.max_children = {{ env "FPM_MAX_CHILDREN" }}
pm.start_servers = {{ env "FPM_START_SERVERS" }}
pm.min_spare_servers = {{ env "FPM_MIN_SPARE_SERVERS" }}
pm.max_spare_servers = {{ env "FPM_MAX_SPARE_SERVERS" }}
; Mitigations for CVE-2026-109618 / CVE-2026-109619 until the image ships
; PHP >= 8.5.12, see https://www.php.net/archive/2026.php#2026-10-21-5
php_admin_value[memory_limit] = -1
php_admin_value[post_max_size] = 32M
php_admin_value[upload_max_filesize] = 30M
php_admin_value[session.upload_progress.enabled] = 0
php_admin_value[fatal_error_backtraces] = 0
+1
View File
@@ -0,0 +1 @@
Rolling release for nextcloud-33: the image is pinned to `nextcloud:33-fpm` (no minor/patch), so it follows the latest 33.x. This is the last release before moving to nextcloud-34.
+15
View File
@@ -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.
+4
View File
@@ -0,0 +1,4 @@
Security: mitigates PHP RCE CVE-2026-109618 / CVE-2026-109619 (https://www.php.net/archive/2026.php#2026-10-21-5)
via the FPM pool config: memory_limit=-1, post_max_size=32M, upload_max_filesize=30M,
session.upload_progress.enabled=0, fatal_error_backtraces=0. PHP_MEMORY_LIMIT and PHP_UPLOAD_LIMIT
are overridden for web requests until the nextcloud image ships PHP >= 8.5.12.