Update to latest release of nextcloud 35

Finally getting to the latest release of nextcloud.
MAINTENANCE.md requests that two maintainers install this
repo successfully on one of their main-servers.

.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
@@ -79,11 +84,14 @@ DEFAULT_QUOTA="10 GB"
 
 # COMPOSE_FILE="$COMPOSE_FILE:compose.authentik.yml"
 # APPS="$APPS sociallogin"
-# AUTHENTIK_USER_PREFIX=authentik
 # AUTHENTIK_DOMAIN=authentik.example.com
 # SECRET_AUTHENTIK_SECRET_VERSION=v1
 # SECRET_AUTHENTIK_ID_VERSION=v1
 
+# Only change this if you've configured your authentik instance to use a non-default user prefix.
+# If you're unsure, this should match the redirect_uri in authentik's nextcloud provider.
+# AUTHENTIK_USER_PREFIX=authentik
+
 #COMPOSE_FILE="$COMPOSE_FILE:compose.fulltextsearch.yml"
 #SECRET_ELASTICSEARCH_PASSWORD_VERSION=v1
 
@@ -109,4 +117,4 @@ DEFAULT_QUOTA="10 GB"
 #HSTS_PRELOAD=1
 
 # Metrics
-# COMPOSE_FILE="$COMPOSE_FILE:compose.metrics.yml"
+# COMPOSE_FILE="$COMPOSE_FILE:compose.metrics.yml"

README.md

@@ -5,7 +5,7 @@
 Fully automated luxury Nextcloud via docker-swarm.
 
 <!-- metadata -->
-* **Maintainer**: [@dannygroenewegen](https://git.coopcloud.tech/dannygroenewegen), [@ineiti](https://git.coopcloud.tech/ineiti), [@javielico](https://git.coopcloud.tech/javielico), Local-IT: [@moritz](https://git.coopcloud.tech/moritz), [@msimon](https://git.coopcloud.tech/simon), [@carla](https://git.coopcloud.tech/carla)
+* **Maintainer**: [@dannygroenewegen](https://git.coopcloud.tech/dannygroenewegen), [@ineiti](https://git.coopcloud.tech/ineiti), [@javielico](https://git.coopcloud.tech/javielico), Local-IT: [@moritz](https://git.coopcloud.tech/moritz), [@simon](https://git.coopcloud.tech/simon), [@carla](https://git.coopcloud.tech/carla)
 * **Category**: Apps
 * **Status**: 5
 * **Image**: [`nextcloud`](https://hub.docker.com/_/nextcloud), 4, upstream
@@ -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>` 

abra.sh

@@ -84,18 +84,31 @@ 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"
     # important for security reaosns
     # https://docs.nextcloud.com/server/latest/admin_manual/office/configuration.html#wopi-settings
     set_app_config richdocuments wopi_allowlist "$COLLABORA_ALLOWLIST"
+    run_occ "richdocuments:activate-config"
 }
 
 install_whiteboard() {
     install_apps whiteboard
     set_app_config whiteboard collabBackendUrl "https://${DOMAIN}/whiteboard"
-    set_app_config whiteboard jwt_secret_key "$(cat /run/secrets/whiteboard_jwt)"
+    printf '{"apps":{"whiteboard":{"jwt_secret_key":"%s"}}}' "$(cat /run/secrets/whiteboard_jwt)" >/tmp/whiteboard.json
+    run_occ "config:import /tmp/whiteboard.json"
+    rm -f /tmp/whiteboard.json
+    [ -n "$(run_occ 'config:app:get whiteboard jwt_secret_key')" ] || {
+        echo "whiteboard jwt_secret_key was not stored" >&2
+        return 1
+    }
 }
 
 

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}

compose.fulltextsearch.yml

@@ -2,7 +2,7 @@ version: "3.8"
 
 services:
   elasticsearch:
-    image: "docker.elastic.co/elasticsearch/elasticsearch:8.19.21"
+    image: "docker.elastic.co/elasticsearch/elasticsearch:8.19.23"
     environment:
       - cluster.name=docker-cluster
       - bootstrap.memory_lock=true
@@ -29,7 +29,7 @@ services:
         mode: 0600
 
   searchindexer:
-    image: nextcloud:33.0.9-fpm
+    image: nextcloud:35.0.2-fpm
     volumes:
       - nextcloud:/var/www/html/
       - nextapps:/var/www/html/custom_apps:cached

compose.whiteboard.yml

@@ -6,7 +6,7 @@ services:
       - whiteboard_jwt
 
   whiteboard:
-    image: ghcr.io/nextcloud-releases/whiteboard:v1.5.9
+    image: ghcr.io/nextcloud-releases/whiteboard:v2.0.0
     deploy:
       labels:
         - traefik.enable=true

compose.yml

@@ -48,7 +48,7 @@ services:
       start_period: 5m
 
   app:
-    image: nextcloud:33.0.9-fpm
+    image: nextcloud:35.0.2-fpm
     depends_on:
       - db
     configs:
@@ -95,7 +95,7 @@ services:
         failure_action: rollback
         order: start-first
       labels:
-        - "coop-cloud.${STACK_NAME}.version=14.2.0+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:35.0.2-fpm
     volumes:
       - nextcloud:/var/www/html/
       - nextapps:/var/www/html/custom_apps:cached
@@ -125,7 +125,7 @@ services:
 
 
   cache:
-    image: redis:8.10.1-alpine
+    image: redis:8.10.2-alpine
     networks:
       - internal
     volumes:

release/14.6.0+33-fpm

@@ -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.

release/15.0.0+34.0.5-fpm

@@ -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.

release/next

@@ -0,0 +1,13 @@
+Upgrades Nextcloud from 34 to 35 (major version upgrade).
+
+IMPORTANT:
+- Do not skip major versions: your instance must be on the latest 34.x before
+  upgrading to 35.
+- 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 35 before upgrading; some
+  apps may need to be updated or temporarily disabled.