forked from coop-cloud/nextcloud
Compare commits
16 Commits
upload-limit
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| c20fa9c4f5 | |||
| 6e12d8fa93 | |||
| f1e7b14b5f | |||
| 295da9e78a | |||
| dcc77aa665 | |||
| 19e7fbb648 | |||
| 6113ccedde | |||
| 0d0c3b3266 | |||
| 45d1985ddc | |||
| d49f3c4ef8 | |||
| a2395c6399 | |||
| e4b3bc4f22 | |||
|
21ea1daf83
|
|||
| ec5934e191 | |||
| 4c3f6fa14d | |||
| eb3816b9c2 |
+15
@@ -69,6 +69,13 @@ DEFAULT_QUOTA="10 GB"
|
||||
# APPS="$APPS onlyoffice"
|
||||
# SECRET_ONLYOFFICE_JWT_VERSION=v1
|
||||
|
||||
# Euro-Office runs its own document server in this stack; EUROOFFICE_DOMAIN
|
||||
# needs its own DNS record pointing at this host.
|
||||
# COMPOSE_FILE="$COMPOSE_FILE:compose.eurooffice.yml"
|
||||
# EUROOFFICE_DOMAIN=eurooffice.example.com
|
||||
# APPS="$APPS eurooffice"
|
||||
# SECRET_EUROOFFICE_JWT_VERSION=v1
|
||||
|
||||
# COMPOSE_FILE="$COMPOSE_FILE:compose.bbb.yml"
|
||||
# BBB_URL=https://talk.example.org/bigbluebutton/ # trailing slash!
|
||||
# SECRET_BBB_SECRET_VERSION=v1
|
||||
@@ -93,6 +100,14 @@ DEFAULT_QUOTA="10 GB"
|
||||
#SECRET_TALK_TURN_SECRET_VERSION=v1 # length=64 charset=default
|
||||
#SECRET_TALK_SIGNALING_SECRET_VERSION=v1 # length=64 charset=default
|
||||
|
||||
# COMPOSE_FILE="$COMPOSE_FILE:compose.user_oidc.yml"
|
||||
# APPS="$APPS user_oidc"
|
||||
# USER_OIDC_PROVIDER=
|
||||
# USER_OIDC_ID=
|
||||
# USER_OIDC_DISCOVERY_URI=
|
||||
# USER_OIDC_END_SESSION_URI=
|
||||
# USER_OIDC_LOGIN_ONLY=false
|
||||
# SECRET_USER_OIDC_SECRET_VERSION=v1
|
||||
|
||||
# HSTS Options
|
||||
# Uncomment this line to enable HSTS: https://docs.nextcloud.com/server/30/admin_manual/installation/harden_server.html
|
||||
|
||||
@@ -25,18 +25,58 @@ Fully automated luxury Nextcloud via docker-swarm.
|
||||
|
||||
### Onlyoffice Integration
|
||||
|
||||
First install onlyoffice following the instructions in the
|
||||
[OnlyOffice Recipe](https://recipes.coopcloud.tech/onlyoffice), and enable
|
||||
the JWT secret.
|
||||
|
||||
`abra app config <app-name>`
|
||||
|
||||
Configure the following envs:
|
||||
Configure the following envs with the URL of the onlyoffice service:
|
||||
```
|
||||
COMPOSE_FILE="$COMPOSE_FILE:compose.apps.yml"
|
||||
ONLYOFFICE_URL=https://onlyoffice.example.com
|
||||
SECRET_ONLYOFFICE_JWT_VERSION=v1
|
||||
```
|
||||
|
||||
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
|
||||
|
||||
Euro-Office is the AGPL fork of OnlyOffice that powers "Nextcloud Office" from
|
||||
Nextcloud 34 onwards. Like OnlyOffice it uses a client-side document-server
|
||||
architecture, so a separate document server is required — but this overlay runs
|
||||
that document server **inside the same stack**, so there is no external host to
|
||||
manage. The browser talks to it directly, so it needs its own public HTTPS
|
||||
domain (`EUROOFFICE_DOMAIN`) with a DNS record pointing at this host.
|
||||
|
||||
`abra app config <app-name>`
|
||||
|
||||
Enable the overlay and set the document server's domain:
|
||||
```
|
||||
COMPOSE_FILE="$COMPOSE_FILE:compose.eurooffice.yml"
|
||||
EUROOFFICE_DOMAIN=eurooffice.example.com
|
||||
APPS="$APPS eurooffice"
|
||||
SECRET_EUROOFFICE_JWT_VERSION=v1
|
||||
```
|
||||
|
||||
The overlay runs the document server with its own Postgres and RabbitMQ services
|
||||
(the image's bundled Postgres is unreliable). The document server schema is
|
||||
seeded into that Postgres automatically on first init (see
|
||||
`eurooffice-createdb.sql`). The Postgres is internal-only and uses trust auth, so
|
||||
the only secret to manage is the JWT; generate it, deploy, then wire up the
|
||||
Nextcloud app:
|
||||
|
||||
* `abra app secret generate -a <app-name>`
|
||||
* `abra app deploy <app-name>`
|
||||
* `abra app cmd <app-name> app install_eurooffice`
|
||||
|
||||
> Note: the document server needs ~4 GB RAM (8 GB for multi-user) and pulls the
|
||||
> `ghcr.io/euro-office/documentserver` image, which currently only publishes a
|
||||
> `latest` tag (no semver / Renovate pinning yet).
|
||||
|
||||
### BBB Integration
|
||||
|
||||
`abra app config <app-name>`
|
||||
@@ -188,6 +228,31 @@ We've been able to get this setup by using the [social login](https://apps.nextc
|
||||
|
||||
If using Keycloak, you'll want to do [this trick](https://janikvonrotz.ch/2020/10/20/openid-connect-with-nextcloud-and-keycloak/) also.
|
||||
|
||||
## How do I enable OpenID Connect (OIDC) providers?
|
||||
[user_oidc](https://github.com/nextcloud/user_oidc) is the recommended way to integrate Nextcloud with OIDC providers.
|
||||
|
||||
Run `abra app config <app-name>`
|
||||
|
||||
Set the following envs:
|
||||
```env
|
||||
COMPOSE_FILE="$COMPOSE_FILE:compose.user_oidc.yml"
|
||||
APPS="$APPS user_oidc"
|
||||
USER_OIDC_PROVIDER=example-provider # this has been tested with keycloak
|
||||
USER_OIDC_ID=example-client-id # get this from your oidc provider
|
||||
USER_OIDC_DISCOVERY_URI=example-oidc-provider.com/.well-known/openid-configuration # get this from your oidc provider
|
||||
USER_OIDC_END_SESSION_URI=example-oidc-provider.com/protocol/openid-connect/logout # get this from your oidc provider
|
||||
USER_OIDC_LOGIN_ONLY=false # set this to true to automatically redirect all logins to your oidc provider
|
||||
SECRET_USER_OIDC_SECRET_VERSION=v1
|
||||
```
|
||||
|
||||
Then insert the client secret from your OIDC provider:
|
||||
```sh
|
||||
abra app secret insert <app-name> user_oidc_secret v1 <client-secret from oidc provider>
|
||||
```
|
||||
|
||||
After you deploy (or redeploy), run the following to set up the user_oidc Nextcloud app:
|
||||
`abra app cmd <app-name> app set_user_oidc`
|
||||
|
||||
## How can I customise the CSS?
|
||||
|
||||
There is some basic stuff in the admin settings.
|
||||
|
||||
@@ -6,6 +6,8 @@ export MY_CNF_VERSION=v6
|
||||
export ENTRYPOINT_VERSION=v3
|
||||
export ENTRYPOINT_WHITEBOARD_VERSION=v1
|
||||
export ENTRYPOINT_TALK_VERSION=v1
|
||||
export ENTRYPOINT_EUROOFFICE_VERSION=v3
|
||||
export EUROOFFICE_CREATEDB_VERSION=v1
|
||||
export CRONTAB_VERSION=v1
|
||||
export PG_BACKUP_VERSION=v2
|
||||
|
||||
@@ -83,6 +85,13 @@ install_onlyoffice() {
|
||||
set_app_config onlyoffice customizationForcesave true
|
||||
}
|
||||
|
||||
install_eurooffice() {
|
||||
install_apps eurooffice
|
||||
set_app_config eurooffice DocumentServerUrl "https://${EUROOFFICE_DOMAIN}"
|
||||
set_app_config eurooffice jwt_secret "$(cat /run/secrets/eurooffice_jwt)"
|
||||
set_app_config eurooffice customizationForcesave true
|
||||
}
|
||||
|
||||
install_collabora() {
|
||||
install_apps richdocuments
|
||||
set_app_config richdocuments wopi_url "$COLLABORA_URL"
|
||||
@@ -159,6 +168,23 @@ set_authentik() {
|
||||
run_occ 'config:system:set lost_password_link --value=disabled'
|
||||
}
|
||||
|
||||
set_user_oidc() {
|
||||
install_apps user_oidc
|
||||
USER_OIDC_SECRET=$(cat /run/secrets/user_oidc_secret)
|
||||
run_occ "user_oidc:provider \
|
||||
--clientid=${USER_OIDC_ID} \
|
||||
--clientsecret=${USER_OIDC_SECRET} \
|
||||
--discoveryuri=${USER_OIDC_DISCOVERY_URI} \
|
||||
--endsessionendpointuri=${USER_OIDC_END_SESSION_URI} \
|
||||
--postlogouturi=https://${DOMAIN} \
|
||||
--scope='openid email profile' \
|
||||
${USER_OIDC_PROVIDER}"
|
||||
# disable non user_oidc login
|
||||
if [[ ${USER_OIDC_LOGIN_ONLY:-false} = "true" ]]; then
|
||||
run_occ "config:app:set --value=0 user_oidc allow_multiple_user_backends"
|
||||
fi
|
||||
}
|
||||
|
||||
disable_skeletondirectory() {
|
||||
run_occ "config:system:set skeletondirectory --value ''"
|
||||
}
|
||||
|
||||
@@ -0,0 +1,118 @@
|
||||
version: "3.8"
|
||||
services:
|
||||
app:
|
||||
secrets:
|
||||
- eurooffice_jwt
|
||||
environment:
|
||||
- EUROOFFICE_DOMAIN
|
||||
|
||||
eurooffice:
|
||||
image: ghcr.io/euro-office/documentserver:latest
|
||||
stdin_open: true
|
||||
depends_on:
|
||||
- eurooffice-db
|
||||
- eurooffice-rabbitmq
|
||||
networks:
|
||||
- proxy
|
||||
- internal
|
||||
environment:
|
||||
- JWT_ENABLED=true
|
||||
- JWT_SECRET_FILE=/run/secrets/eurooffice_jwt
|
||||
# Use external Postgres + RabbitMQ instead of the flaky bundled ones.
|
||||
# (The all-in-one image ships an uncleanly-shut-down Postgres data dir
|
||||
# whose crash recovery exceeds pg_ctl's start timeout -> restart loop.)
|
||||
- DB_TYPE=postgres
|
||||
- DB_HOST=eurooffice-db
|
||||
- DB_PORT=5432
|
||||
- DB_NAME=eurooffice
|
||||
- DB_USER=eurooffice
|
||||
- AMQP_URI=amqp://guest:guest@eurooffice-rabbitmq
|
||||
volumes:
|
||||
- eurooffice_data:/var/lib/euro-office
|
||||
- eurooffice_config:/etc/euro-office
|
||||
- eurooffice_logs:/var/log/euro-office
|
||||
- eurooffice_fonts:/usr/share/fonts/custom
|
||||
secrets:
|
||||
- eurooffice_jwt
|
||||
configs:
|
||||
- source: entrypoint_eurooffice
|
||||
target: /custom-entrypoint.sh
|
||||
mode: 555
|
||||
entrypoint: /custom-entrypoint.sh
|
||||
healthcheck:
|
||||
test: ["CMD", "curl", "-f", "http://localhost/healthcheck"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 10
|
||||
start_period: 3m
|
||||
deploy:
|
||||
update_config:
|
||||
failure_action: rollback
|
||||
order: start-first
|
||||
labels:
|
||||
- "traefik.enable=true"
|
||||
- "traefik.swarm.network=proxy"
|
||||
- "traefik.http.services.${STACK_NAME}_eurooffice.loadbalancer.server.port=80"
|
||||
- "traefik.http.routers.${STACK_NAME}_eurooffice.rule=Host(`${EUROOFFICE_DOMAIN}`)"
|
||||
- "traefik.http.routers.${STACK_NAME}_eurooffice.entrypoints=web-secure"
|
||||
- "traefik.http.routers.${STACK_NAME}_eurooffice.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
||||
- "traefik.http.routers.${STACK_NAME}_eurooffice.middlewares=${STACK_NAME}_eurooffice-fwdproto"
|
||||
- "traefik.http.middlewares.${STACK_NAME}_eurooffice-fwdproto.headers.customRequestHeaders.X-Forwarded-Proto=https"
|
||||
|
||||
eurooffice-db:
|
||||
image: postgres:16-alpine
|
||||
networks:
|
||||
- internal
|
||||
environment:
|
||||
- POSTGRES_DB=eurooffice
|
||||
- POSTGRES_USER=eurooffice
|
||||
# Internal-only DB holding transient editing state; trust auth on the
|
||||
# private overlay network avoids managing a Swarm secret for it.
|
||||
- POSTGRES_HOST_AUTH_METHOD=trust
|
||||
volumes:
|
||||
- eurooffice_db:/var/lib/postgresql/data
|
||||
configs:
|
||||
# Seed the document server schema on first init. The all-in-one image only
|
||||
# creates its schema in the *bundled* Postgres; with an external DB the
|
||||
# docservice starts against an empty DB, errors on missing task_result /
|
||||
# doc_changes, never binds its port, and gets healthcheck-killed in a loop.
|
||||
- source: eurooffice_createdb
|
||||
target: /docker-entrypoint-initdb.d/createdb.sql
|
||||
healthcheck:
|
||||
test: ["CMD", "pg_isready", "-U", "eurooffice"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 10
|
||||
start_period: 1m
|
||||
|
||||
eurooffice-rabbitmq:
|
||||
image: rabbitmq:4.3.2
|
||||
networks:
|
||||
- internal
|
||||
healthcheck:
|
||||
test: rabbitmq-diagnostics -q ping
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 10
|
||||
start_period: 1m
|
||||
|
||||
secrets:
|
||||
eurooffice_jwt:
|
||||
external: true
|
||||
name: ${STACK_NAME}_eurooffice_jwt_${SECRET_EUROOFFICE_JWT_VERSION}
|
||||
|
||||
volumes:
|
||||
eurooffice_data:
|
||||
eurooffice_config:
|
||||
eurooffice_logs:
|
||||
eurooffice_fonts:
|
||||
eurooffice_db:
|
||||
|
||||
configs:
|
||||
entrypoint_eurooffice:
|
||||
name: ${STACK_NAME}_entrypoint_eurooffice_${ENTRYPOINT_EUROOFFICE_VERSION}
|
||||
file: entrypoint.eurooffice.sh.tmpl
|
||||
template_driver: golang
|
||||
eurooffice_createdb:
|
||||
name: ${STACK_NAME}_eurooffice_createdb_${EUROOFFICE_CREATEDB_VERSION}
|
||||
file: eurooffice-createdb.sql
|
||||
@@ -2,7 +2,7 @@ version: "3.8"
|
||||
|
||||
services:
|
||||
elasticsearch:
|
||||
image: "docker.elastic.co/elasticsearch/elasticsearch:8.17.2"
|
||||
image: "docker.elastic.co/elasticsearch/elasticsearch:8.19.16"
|
||||
environment:
|
||||
- cluster.name=docker-cluster
|
||||
- bootstrap.memory_lock=true
|
||||
@@ -29,7 +29,7 @@ services:
|
||||
mode: 0600
|
||||
|
||||
searchindexer:
|
||||
image: nextcloud:32.0.3-fpm
|
||||
image: nextcloud:34.0.1-fpm
|
||||
volumes:
|
||||
- nextcloud:/var/www/html/
|
||||
- nextapps:/var/www/html/custom_apps:cached
|
||||
|
||||
@@ -10,7 +10,7 @@ services:
|
||||
- NEXTCLOUD_UPDATE=1
|
||||
|
||||
db:
|
||||
image: "postgres:13"
|
||||
image: "pgautoupgrade/pgautoupgrade:14-debian"
|
||||
command: -c "max_connections=${MAX_DB_CONNECTIONS:-100}"
|
||||
volumes:
|
||||
- "postgres:/var/lib/postgresql/data"
|
||||
|
||||
+2
-2
@@ -14,7 +14,7 @@ services:
|
||||
deploy:
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
- traefik.docker.network=proxy
|
||||
- traefik.swarm.network=proxy
|
||||
- traefik.http.services.${STACK_NAME}_talk.loadbalancer.server.port=8081
|
||||
- traefik.http.routers.${STACK_NAME}_talk.rule=Host(`${TALK_DOMAIN}`)
|
||||
- traefik.http.routers.${STACK_NAME}_talk.entrypoints=web-secure
|
||||
@@ -67,4 +67,4 @@ configs:
|
||||
entrypoint_talk:
|
||||
name: ${STACK_NAME}_entrypoint_talk_${ENTRYPOINT_TALK_VERSION}
|
||||
file: entrypoint.talk.sh.tmpl
|
||||
template_driver: golang
|
||||
template_driver: golang
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
version: "3.8"
|
||||
services:
|
||||
app:
|
||||
secrets:
|
||||
- user_oidc_secret
|
||||
|
||||
secrets:
|
||||
user_oidc_secret:
|
||||
external: true
|
||||
name: ${STACK_NAME}_user_oidc_secret_${SECRET_USER_OIDC_SECRET_VERSION}
|
||||
@@ -6,11 +6,11 @@ services:
|
||||
- whiteboard_jwt
|
||||
|
||||
whiteboard:
|
||||
image: ghcr.io/nextcloud-releases/whiteboard:v1.5.0
|
||||
image: ghcr.io/nextcloud-releases/whiteboard:v1.5.9
|
||||
deploy:
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
- traefik.docker.network=proxy
|
||||
- traefik.swarm.network=proxy
|
||||
- traefik.http.services.${STACK_NAME}_whiteboard.loadbalancer.server.port=3002
|
||||
- traefik.http.routers.${STACK_NAME}_whiteboard.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS}) && PathPrefix(`/whiteboard`)
|
||||
- traefik.http.routers.${STACK_NAME}_whiteboard.entrypoints=web-secure
|
||||
@@ -41,4 +41,4 @@ configs:
|
||||
entrypoint_whiteboard:
|
||||
name: ${STACK_NAME}_entrypoint_whiteboard_${ENTRYPOINT_WHITEBOARD_VERSION}
|
||||
file: entrypoint.whiteboard.sh.tmpl
|
||||
template_driver: golang
|
||||
template_driver: golang
|
||||
|
||||
+6
-6
@@ -1,7 +1,7 @@
|
||||
version: "3.8"
|
||||
services:
|
||||
web:
|
||||
image: nginx:1.29.4
|
||||
image: nginx:1.31.1
|
||||
depends_on:
|
||||
- app
|
||||
configs:
|
||||
@@ -29,7 +29,7 @@ services:
|
||||
order: start-first
|
||||
labels:
|
||||
- "traefik.enable=true"
|
||||
- "traefik.docker.network=proxy"
|
||||
- "traefik.swarm.network=proxy"
|
||||
- "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=80"
|
||||
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
|
||||
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
||||
@@ -48,7 +48,7 @@ services:
|
||||
start_period: 5m
|
||||
|
||||
app:
|
||||
image: nextcloud:32.0.3-fpm
|
||||
image: nextcloud:34.0.1-fpm
|
||||
depends_on:
|
||||
- db
|
||||
configs:
|
||||
@@ -95,7 +95,7 @@ services:
|
||||
failure_action: rollback
|
||||
order: start-first
|
||||
labels:
|
||||
- "coop-cloud.${STACK_NAME}.version=13.0.1+32.0.3-fpm"
|
||||
- "coop-cloud.${STACK_NAME}.version=15.1.0+34.0.1-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:32.0.3-fpm
|
||||
image: nextcloud:34.0.1-fpm
|
||||
volumes:
|
||||
- nextcloud:/var/www/html/
|
||||
- nextapps:/var/www/html/custom_apps:cached
|
||||
@@ -125,7 +125,7 @@ services:
|
||||
|
||||
|
||||
cache:
|
||||
image: redis:8.4.0-alpine
|
||||
image: redis:8.8.0-alpine
|
||||
networks:
|
||||
- internal
|
||||
volumes:
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -eu
|
||||
|
||||
# Read a Swarm secret file (<VAR>_FILE) into the plain env var the
|
||||
# Euro-Office document server expects, then hand off to its own entrypoint.
|
||||
file_env() {
|
||||
local var="$1"
|
||||
local fileVar="${var}_FILE"
|
||||
local def="${2:-}"
|
||||
|
||||
if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
|
||||
echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
local val="$def"
|
||||
if [ "${!var:-}" ]; then
|
||||
val="${!var}"
|
||||
elif [ "${!fileVar:-}" ]; then
|
||||
val="$(< "${!fileVar}")"
|
||||
fi
|
||||
|
||||
export "$var"="$val"
|
||||
unset "$fileVar"
|
||||
}
|
||||
|
||||
file_env "JWT_SECRET"
|
||||
|
||||
exec /entrypoint.sh
|
||||
@@ -0,0 +1,73 @@
|
||||
--
|
||||
-- Create schema onlyoffice
|
||||
--
|
||||
|
||||
-- CREATE DATABASE onlyoffice ENCODING = 'UTF8' CONNECTION LIMIT = -1;
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for doc_changes
|
||||
-- ----------------------------
|
||||
CREATE TABLE IF NOT EXISTS "doc_changes" (
|
||||
"tenant" varchar(255) COLLATE "default" NOT NULL,
|
||||
"id" varchar(255) COLLATE "default" NOT NULL,
|
||||
"change_id" int4 NOT NULL,
|
||||
"user_id" varchar(255) COLLATE "default" NOT NULL,
|
||||
"user_id_original" varchar(255) COLLATE "default" NOT NULL,
|
||||
"user_name" varchar(255) COLLATE "default" NOT NULL,
|
||||
"change_data" text COLLATE "default" NOT NULL,
|
||||
"change_date" timestamp without time zone NOT NULL,
|
||||
PRIMARY KEY ("tenant", "id", "change_id")
|
||||
)
|
||||
WITH (OIDS=FALSE);
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for task_result
|
||||
-- ----------------------------
|
||||
CREATE TABLE IF NOT EXISTS "task_result" (
|
||||
"tenant" varchar(255) COLLATE "default" NOT NULL,
|
||||
"id" varchar(255) COLLATE "default" NOT NULL,
|
||||
"status" int2 NOT NULL,
|
||||
"status_info" int4 NOT NULL,
|
||||
"created_at" timestamp without time zone DEFAULT NOW(),
|
||||
"last_open_date" timestamp without time zone NOT NULL,
|
||||
"user_index" int4 NOT NULL DEFAULT 1,
|
||||
"change_id" int4 NOT NULL DEFAULT 0,
|
||||
"callback" text COLLATE "default" NOT NULL,
|
||||
"baseurl" text COLLATE "default" NOT NULL,
|
||||
"password" text COLLATE "default" NULL,
|
||||
"additional" text COLLATE "default" NULL,
|
||||
PRIMARY KEY ("tenant", "id")
|
||||
)
|
||||
WITH (OIDS=FALSE);
|
||||
|
||||
CREATE OR REPLACE FUNCTION merge_db(_tenant varchar(255), _id varchar(255), _status int2, _status_info int4, _last_open_date timestamp without time zone, _user_index int4, _change_id int4, _callback text, _baseurl text, OUT isupdate char(5), OUT userindex int4) AS
|
||||
$$
|
||||
DECLARE
|
||||
t_var "task_result"."user_index"%TYPE;
|
||||
BEGIN
|
||||
LOOP
|
||||
-- first try to update the key
|
||||
-- note that "a" must be unique
|
||||
IF ((_callback <> '') IS TRUE) AND ((_baseurl <> '') IS TRUE) THEN
|
||||
UPDATE "task_result" SET last_open_date=_last_open_date, user_index=user_index+1,callback=_callback,baseurl=_baseurl WHERE tenant = _tenant AND id = _id RETURNING user_index into userindex;
|
||||
ELSE
|
||||
UPDATE "task_result" SET last_open_date=_last_open_date, user_index=user_index+1 WHERE tenant = _tenant AND id = _id RETURNING user_index into userindex;
|
||||
END IF;
|
||||
IF found THEN
|
||||
isupdate := 'true';
|
||||
RETURN;
|
||||
END IF;
|
||||
-- not there, so try to insert the key
|
||||
-- if someone else inserts the same key concurrently,
|
||||
-- we could get a unique-key failure
|
||||
BEGIN
|
||||
INSERT INTO "task_result"(tenant, id, status, status_info, last_open_date, user_index, change_id, callback, baseurl) VALUES(_tenant, _id, _status, _status_info, _last_open_date, _user_index, _change_id, _callback, _baseurl) RETURNING user_index into userindex;
|
||||
isupdate := 'false';
|
||||
RETURN;
|
||||
EXCEPTION WHEN unique_violation THEN
|
||||
-- do nothing, and loop to try the UPDATE again
|
||||
END;
|
||||
END LOOP;
|
||||
END;
|
||||
$$
|
||||
LANGUAGE plpgsql;
|
||||
@@ -0,0 +1,3 @@
|
||||
Important:
|
||||
Posgres: Due to end of support for postgres 13 we upgraded to pgautoupgrade-14-debian but we could not test it, so please take backups before the upgrade!
|
||||
Elastic Search: We chose the latest minor update for elasticsearch but we were also not able to test it.
|
||||
@@ -0,0 +1,10 @@
|
||||
Upgrades Nextcloud from 32.0.11 to 33.0.6 (major version upgrade).
|
||||
|
||||
IMPORTANT:
|
||||
- Nextcloud does NOT support downgrades. Take a backup before deploying.
|
||||
- Do not skip major versions: your instance must be on the latest 32.x before
|
||||
upgrading to 33. If you are on an older 32.x, deploy 32.0.11 first.
|
||||
- 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 33 before upgrading; some
|
||||
apps may need to be updated or temporarily disabled.
|
||||
@@ -0,0 +1,13 @@
|
||||
Upgrades Nextcloud from 33.0.6 to 34.0.1 (major version upgrade).
|
||||
|
||||
IMPORTANT:
|
||||
- Nextcloud does NOT support downgrades. Take a backup before deploying.
|
||||
- Do not skip major versions: your instance must be on the latest 33.x before
|
||||
upgrading to 34. If you are on 32.x, deploy 14.0.0+33.0.6-fpm first.
|
||||
- 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.
|
||||
- PostgreSQL: Nextcloud 34 requires PostgreSQL >= 14 (the recipe already ships
|
||||
pgautoupgrade 14). PostgreSQL 14 is now the minimum, so plan a bump to a newer
|
||||
PostgreSQL before the next Nextcloud major.
|
||||
@@ -0,0 +1,25 @@
|
||||
Adds an optional Euro-Office integration (compose.eurooffice.yml).
|
||||
|
||||
Euro-Office is the AGPL fork of OnlyOffice that powers "Nextcloud Office" from
|
||||
Nextcloud 34 onwards. This overlay runs the Euro-Office document server inside
|
||||
the stack, so there is no external document server to manage.
|
||||
|
||||
This change is additive: existing installs are unaffected unless you opt in.
|
||||
|
||||
To enable it (`abra app config <app>`):
|
||||
- COMPOSE_FILE="$COMPOSE_FILE:compose.eurooffice.yml"
|
||||
- EUROOFFICE_DOMAIN=eurooffice.example.com
|
||||
- APPS="$APPS eurooffice"
|
||||
- SECRET_EUROOFFICE_JWT_VERSION=v1
|
||||
|
||||
Then:
|
||||
- Create a DNS record for EUROOFFICE_DOMAIN pointing at this host (the browser
|
||||
talks to the document server directly over HTTPS).
|
||||
- `abra app secret generate -a <app>`
|
||||
- `abra app deploy <app>`
|
||||
- `abra app cmd <app> app install_eurooffice`
|
||||
|
||||
Notes:
|
||||
- The document server needs ~4 GB RAM (8 GB recommended for multi-user).
|
||||
- The `ghcr.io/euro-office/documentserver` image currently only publishes a
|
||||
`latest` tag (no semver pinning yet), so it is not tracked by Renovate.
|
||||
Reference in New Issue
Block a user