Compare commits

...

56 Commits
main ... main

Author SHA1 Message Date
85e5070b8d docs: Adds troubleshooting section for fulltextsearch 2025-05-23 15:32:02 +02:00
36615bc097 chore: publish 11.3.0+30.0.6-fpm release 2025-05-20 18:20:05 +02:00
a3cd6741eb
improve secret handling for whiteboard 2025-05-20 18:17:46 +02:00
cb453e884d
chore: publish 11.2.0+30.0.6-fpm release 2025-05-13 23:59:33 +02:00
267f3cbb78 chore: publish 11.1.0+30.0.6-fpm release 2025-02-15 14:43:25 +01:00
b0c4f06af1 chore: publish 11.0.1+30.0.4-fpm release 2025-02-03 13:37:05 +01:00
750477a409 fix mariadb backup label 2025-02-03 13:19:08 +01:00
7a7da21544 Update .drone.yml 2025-01-08 10:09:13 -08:00
d72a8fdcdb Merge pull request 'upgrade to mariadb 11.4' (#45) from MIR/nextcloud:main into main
Reviewed-on: coop-cloud/nextcloud#45
2024-12-22 21:32:37 +00:00
7aa4e15034 upgrade to mariadb 11.4 2024-12-21 16:56:09 -05:00
Steven Sting
0c5b05957c chore: publish 10.0.0+30.0.4-fpm release 2024-12-20 16:50:42 +01:00
d8cb3719e2 fix authentik logout url 2024-12-03 22:34:12 +01:00
bbc834a62d chore: publish 9.2.0+29.0.8-fpm release 2024-11-08 15:23:34 +01:00
da8f7fb447 fix drone runner 2024-10-24 12:48:45 +02:00
ee2c5a2b42 update pg_backup.sh 2024-10-22 21:31:41 +02:00
182a42ff1f update backupbot labels 2024-10-22 15:18:37 +02:00
5a397ce63e Merge branch 'main' of ssh://git.coopcloud.tech:2222/coop-cloud/nextcloud 2024-10-08 10:14:57 +02:00
ccb54f34d4
Added note about our experiances upgrading Nextcloud 2024-10-07 16:25:26 +01:00
3143e99572 add function to set windows forbidden filename characters 2024-10-02 14:30:41 +02:00
9859907d4b chore: publish 9.1.2+29.0.5-fpm release 2024-10-01 11:37:15 +02:00
6c0fa9c12d chore: publish 9.1.2+29.0.5-fpm release 2024-09-30 17:21:04 +02:00
a3c99a72bf add-theming (#44)
Reviewed-on: coop-cloud/nextcloud#44
Co-authored-by: Simon <simonthiessen@posteo.de>
Co-committed-by: Simon <simonthiessen@posteo.de>
2024-09-30 14:24:07 +00:00
c94ffed09d chore: publish 9.0.0+29.0.5-fpm release 2024-08-26 18:11:43 +01:00
7a863573c9 Merge pull request 'add abra command for disabling the skeleton directory' (#42) from Apfelwurm/nextcloud:main into main
Reviewed-on: coop-cloud/nextcloud#42
Reviewed-by: decentral1se <decentral1se@noreply.git.coopcloud.tech>
2024-07-21 15:56:43 +00:00
c930bbcf56 chore: publish 8.0.1+29.0.3-fpm release 2024-07-19 18:51:54 +02:00
a13e7a509c add abra command for disabling the skeleton directory 2024-07-19 17:58:06 +02:00
0f9aba3e9e alaconnect: replace 'execute' with 'initial-hooks' 2024-07-15 13:57:58 +02:00
eb3e2486ce chore: publish 8.0.0+29.0.1-fpm release 2024-06-19 18:53:22 +02:00
2b4e63ef31 Reapply "split bbb and onlyoffice compose.yml"
This reverts commit 180c26933779d81b8a6f9805223e003a66fcbaac.
2024-06-19 18:36:05 +02:00
c056687849 chore: publish 7.0.3+29.0.1-fpm release 2024-06-19 18:35:19 +02:00
180c269337 Revert "split bbb and onlyoffice compose.yml"
This reverts commit 9be859db25629c524889d159118a67270c96142d.
Accidentally introduced a breaking change into a patch release
2024-06-19 18:34:02 +02:00
7eea2e0785 chore: publish 7.0.2+29.0.1-fpm release 2024-06-19 16:42:46 +02:00
be915272b4 fix multi-file downloads, see https://github.com/nextcloud/server/issues/42617#issuecomment-1881958718 2024-06-19 16:41:55 +02:00
9be859db25 split bbb and onlyoffice compose.yml 2024-06-19 15:40:27 +02:00
97e1d72604 Revert "wip split config"
This reverts commit 8a1fae2bacbd2742b9291325dcaea9914106f8f9.
2024-06-14 16:00:14 +02:00
8a1fae2bac wip split config 2024-06-06 17:14:50 +02:00
3wc
ce817e3928 chore: publish 7.0.1+29.0.1-fpm release 2024-06-01 15:05:05 -05:00
7a64d3c6a7 add alakazam integration file alaconnect.yml 2024-05-13 17:30:26 +02:00
3wc
bb781e654b chore: publish 7.0.0+29.0.0-fpm release 2024-05-12 14:08:32 -03:00
cb5cd5f7b2 fix release note 5.0.1+27.0.1-fpm 2024-05-08 11:05:05 +02:00
3wc
0a3e943b26 chore: publish 6.0.4+28.0.5-fpm release 2024-05-07 19:31:54 -03:00
3wc
4f1aaf5d1d Increase memory limit for cron
Re coop-cloud/nextcloud#41
2024-05-07 19:30:49 -03:00
3wc
019b71fde1 chore: publish 6.0.3+28.0.5-fpm release 2024-05-07 15:18:19 -03:00
3wc
7527399da0 Add mjs as a mimetype for javascript 2024-05-07 15:18:19 -03:00
3wc
94e84122ed chore: publish 6.0.2+28.0.5-fpm release 2024-05-07 15:18:19 -03:00
0d9ab936a0 fulltextsearch: rename and update image 2024-05-07 15:18:19 -03:00
09ec6f842c update to 28.0.5 2024-04-30 15:50:17 +02:00
3wc
b5d40aa428 Update metadata 2024-03-30 15:48:50 -03:00
eead80b60a add env MAX_DB_CONNECTIONS to set the database connection limit 2024-02-27 09:47:26 +01:00
3wc
24670cdb6b chore: publish 6.0.1+28.0.2-fpm release 2024-02-08 14:51:39 -03:00
3wc
7e4ab9288c chore: publish 6.0.0+28.0.1-fpm release 2024-01-20 21:51:02 -03:00
199bf61300 chore: publish 5.2.0+27.1.5-fpm release 2023-12-22 13:19:26 +01:00
99514b5991 feat: add fulltextsearch using elasticsearch (#36)
Reviewed-on: coop-cloud/nextcloud#36
Co-authored-by: p4u1 <p4u1_f4u1@riseup.net>
Co-committed-by: p4u1 <p4u1_f4u1@riseup.net>
2023-12-22 12:09:58 +00:00
eefb14e150 refactor: move db_root_password to mariadb (#38)
It is only used by mariadb and not by postgres

Closes coop-cloud/nextcloud#34

Reviewed-on: coop-cloud/nextcloud#38
Co-authored-by: p4u1 <p4u1_f4u1@riseup.net>
Co-committed-by: p4u1 <p4u1_f4u1@riseup.net>
2023-12-22 12:09:07 +00:00
a34e100bd7 chore: publish 5.1.1+27.1.5-fpm release 2023-12-21 23:23:20 +01:00
24ca6b22bc fix: noindex, nofollow instead of none robots header (#37)
This fixes a warning shown on the administration page.
More info on: https://help.nextcloud.com/t/x-robots-tag-http-header-not-configured-with-noindex-nofollow-since-nc-26-0-0/158300/1

Reviewed-on: coop-cloud/nextcloud#37
Co-authored-by: p4u1 <p4u1_f4u1@riseup.net>
Co-committed-by: p4u1 <p4u1_f4u1@riseup.net>
2023-12-19 14:50:46 +00:00
22 changed files with 389 additions and 53 deletions

View File

@ -22,6 +22,8 @@ steps:
NGINX_CONF_VERSION: v1
MY_CNF_VERSION: v1
ENTRYPOINT_VERSION: v1
CRONTAB_VERSION: v1
PG_BACKUP_VERSION: v2
SECRET_DB_PASSWORD_VERSION: v1
SECRET_DB_ROOT_PASSWORD_VERSION: v1
SECRET_ADMIN_PASSWORD_VERSION: v1
@ -43,7 +45,7 @@ steps:
from_secret: drone_abra-bot_token
fork: true
repositories:
- coop-cloud/auto-recipes-catalogue-json
- toolshed/auto-recipes-catalogue-json
trigger:
event: tag

View File

@ -1,6 +1,7 @@
TYPE=nextcloud
TIMEOUT=900
ENABLE_AUTO_UPDATE=true
ENABLE_BACKUPS=true
DOMAIN=nextcloud.example.com
## Domain aliases
@ -11,6 +12,8 @@ COMPOSE_FILE="compose.yml"
COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml"
#COMPOSE_FILE="$COMPOSE_FILE:compose.postgres.yml"
#MAX_DB_CONNECTIONS=500
ADMIN_USER=admin
SECRET_DB_ROOT_PASSWORD_VERSION=v1
@ -42,23 +45,39 @@ DEFAULT_QUOTA="10 GB"
# MAIL_DOMAIN=
# SECRET_SMTP_PASSWORD_VERSION=v1
# COMPOSE_FILE="$COMPOSE_FILE:compose.apps.yml"
# APPS="calendar sociallogin onlyoffice"
#
# ONLYOFFICE_URL=https://onlyoffice.example.com
# SECRET_ONLYOFFICE_JWT_VERSION=v1
#
## Customization
# THEMING_COLOR=
# THEMING_SLOGAN=
# COPY_ASSETS="flow_background.jpg|app:/var/www/html/themes/"
# COPY_ASSETS="$COPY_ASSETS icon_left_brand.svg|app:/var/www/html/themes/"
# COPY_ASSETS="$COPY_ASSETS icon.png|app:/var/www/html/themes/"
# APPS="calendar"
# COLLABORA_URL=https://collabora.example.com
#
# COMPOSE_FILE="$COMPOSE_FILE:compose.onlyoffice.yml"
# ONLYOFFICE_URL=https://onlyoffice.example.com
# APPS="$APPS onlyoffice"
# SECRET_ONLYOFFICE_JWT_VERSION=v1
# COMPOSE_FILE="$COMPOSE_FILE:compose.bbb.yml"
# BBB_URL=https://talk.example.org/bigbluebutton/ # trailing slash!
# SECRET_BBB_SECRET_VERSION=v1
#
# OCC_CMDS="app:disable dashboard"
# OCC_CMDS="$OCC_CMDS|config:app:set sociallogin auto_create_groups --value 1"
# OCC_CMDS="$OCC_CMDS|config:app:set sociallogin hide_default_login --value 1"
# COMPOSE_FILE="$COMPOSE_FILE:compose.whiteboard.yml"
# APPS="$APPS whiteboard"
# SECRET_WHITEBOARD_JWT_VERSION=v1
# 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
# OCC_CMDS="app:disable dashboard"
# OCC_CMDS="$OCC_CMDS|config:app:set sociallogin auto_create_groups --value 1"
# OCC_CMDS="$OCC_CMDS|config:app:set sociallogin hide_default_login --value 1"
#COMPOSE_FILE="$COMPOSE_FILE:compose.fulltextsearch.yml"
#SECRET_ELASTICSEARCH_PASSWORD_VERSION=v1

View File

@ -6,10 +6,10 @@ Fully automated luxury Nextcloud via docker-swarm.
<!-- metadata -->
* **Category**: Apps
* **Status**: 2, beta
* **Status**: 5
* **Image**: [`nextcloud`](https://hub.docker.com/_/nextcloud), 4, upstream
* **Healthcheck**: Yes
* **Backups**: No
* **Backups**: Yes
* **Email**: 3
* **Tests**: 2
* **SSO**: 1 (OAuth)
@ -17,7 +17,6 @@ Fully automated luxury Nextcloud via docker-swarm.
## Quick start
* `abra app new nextcloud`
* `abra app config <app-name>`
* `abra app secret insert <app-name> smtp_password v1 <SMTP_PASSWORD>`
@ -88,7 +87,12 @@ OCC_CMDS="app:disable dashboard"
- Configure a `defaultapp` in your `config.php` or use [apporder](https://apps.nextcloud.com/apps/apporder)
## Upgrading Nextcloud apps
## Upgrading Nextcloud
Upgrading Nextcloud can be a hair raising experiance. They [don't support downgrading](https://docs.nextcloud.com/server/latest/admin_manual/maintenance/upgrade.html) even for minor versions.
Many of us have found that jumping major versions when upgrading is also a bad idea. We have however found that it's ok to skip minor version upgrades and go to the last minor version before a major version (e.g. 24.0.0 to 24.9.9 before going to 25.0.0). To extra cautious just upgrade one release at a time. Read the release notes and check your logs.
## Upgrading Nextcloud apps (plug-ins)
`abra app cmd <app-name> app run_occ '"app:update --all"'`
@ -244,3 +248,49 @@ docker exec -u www-data $(docker ps -f name=foo_com_app -q) ./occ preview:pre-ge
```
This app will improve performance of image browsing at the cost of storage space.
## Fulltextsearch using elasticsearch
1. Uncomment the following lines in your env file:
```
#COMPOSE_FILE="$COMPOSE_FILE:compose.fulltextsearch.yml"
#SECRET_ELASTICSEARCH_PASSWORD_VERSION=v1
```
2. Generate the secret for elasticsearch:
```bash
abra app secret generate <domain> elasticsearch_password v1
```
3. Deploy your app:
```bash
abra app deploy <domain>
```
4. Install the apps and configure them:
```
abra app cmd <domain> app install_fulltextsearch
```
5. You might need to configure the files_fulltextsearch app. run this command to check its settings:
```
abra app cmd <domain> app run_occ '"config:list files_fulltextsearch"
```
6. You can check if the nextcloud can connect to elasticsearch:
```
abra app cmd <domain> app run_occ '"fulltextsearch:test"'
```
And you can populate the index manually and check if any errors occur:
```
abra app cmd <domain> app run_occ '"fulltextsearch:index"'
```
### Troubleshooting fulltextsearch
The fulltextsearch plugin might be stuck with this error: "Index is already running". In that case the following command can get things runing again:
```
abra app run <domain> db /bin/sh -- -c 'echo "delete from oc_fulltextsearch_ticks;" | mariadb -u root -p$(cat /run/secrets/db_root_password) nextcloud'
```

66
abra.sh
View File

@ -1,9 +1,12 @@
#!/bin/bash
export FPM_TUNE_VERSION=v5
export NGINX_CONF_VERSION=v4
export MY_CNF_VERSION=v4
export NGINX_CONF_VERSION=v7
export MY_CNF_VERSION=v5
export ENTRYPOINT_VERSION=v3
export ENTRYPOINT_WHITEBOARD_VERSION=v1
export CRONTAB_VERSION=v1
export PG_BACKUP_VERSION=v2
run_occ() {
su -p www-data -s /bin/sh -c "/var/www/html/occ $@"
@ -51,6 +54,27 @@ set_logfile_stdout() {
set_system_config logfile '/dev/stdout'
}
customize() {
if [ -z "$1" ]
then
echo "Usage: ... customize <assets_path>"
exit 1
fi
asset_dir=$1
for asset in $COPY_ASSETS; do
source=$(echo $asset | cut -d "|" -f1)
target=$(echo $asset | cut -d "|" -f2)
echo copy $source to $target
abra app cp $APP_NAME $asset_dir/$source $target
done
abra app cmd -T $APP_NAME app set_app_config theming color \"$THEMING_COLOR\"
abra app cmd -T $APP_NAME app set_app_config theming slogan \"$THEMING_SLOGAN\"
abra app cmd -T $APP_NAME app run_occ '"theming:config background \"/var/www/html/themes/flow_background.jpg\""'
abra app cmd -T $APP_NAME app run_occ '"theming:config logo \"/var/www/html/themes/icon_left_brand.svg\""'
abra app cmd -T $APP_NAME app run_occ '"theming:config logoheader \"/var/www/html/themes/icon.png\""'
}
install_bbb() {
install_apps bbb
set_app_config bbb app.navigation true
@ -70,6 +94,23 @@ install_collabora() {
set_app_config richdocuments wopi_url "$COLLABORA_URL"
}
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)"
}
install_fulltextsearch() {
install_apps fulltextsearch
install_apps fulltextsearch_elasticsearch
install_apps files_fulltextsearch
set_app_config fulltextsearch search_platform "OCA\\FullTextSearch_Elasticsearch\\Platform\\ElasticSearchPlatform"
set_app_config fulltextsearch_elasticsearch elastic_host "http://elastic:$(cat /run/secrets/elasticsearch_password)@elasticsearch:9200/"
set_app_config fulltextsearch_elasticsearch elastic_index "nextcloud"
set_app_config files_fulltextsearch files_local "1"
}
set_default_quota() {
set_app_config files default_quota "$DEFAULT_QUOTA"
}
@ -78,6 +119,7 @@ set_authentik() {
install_apps sociallogin
AUTHENTIK_SECRET=$(cat /run/secrets/authentik_secret)
AUTHENTIK_ID=$(cat /run/secrets/authentik_id)
set_system_config logo_url https://$AUTHENTIK_DOMAIN
set_app_config sociallogin custom_providers "
{
\"custom_oidc\":[
@ -88,7 +130,7 @@ set_authentik() {
\"tokenUrl\": \"https://$AUTHENTIK_DOMAIN/application/o/token/\",
\"displayNameClaim\":\"preferred_username\",
\"userInfoUrl\": \"https://$AUTHENTIK_DOMAIN/application/o/userinfo/\",
\"logoutUrl\": \"https://$AUTHENTIK_DOMAIN/if/session-end/nextcloud/\",
\"logoutUrl\": \"https://$AUTHENTIK_DOMAIN/application/o/nextcloud/end-session/\",
\"clientId\":\"$AUTHENTIK_ID\",
\"clientSecret\":\"$AUTHENTIK_SECRET\",
\"scope\":\"openid profile email nextcloud\",
@ -110,3 +152,21 @@ set_authentik() {
run_occ 'config:system:set allow_user_to_change_display_name --value=false'
run_occ 'config:system:set lost_password_link --value=disabled'
}
disable_skeletondirectory() {
run_occ "config:system:set skeletondirectory --value ''"
}
set_windowsfriendly_filenames() {
run_occ 'config:system:set forbidden_filename_characters 0 --value=?'
run_occ 'config:system:set forbidden_filename_characters 1 --value=\<'
run_occ 'config:system:set forbidden_filename_characters 2 --value=\>'
run_occ 'config:system:set forbidden_filename_characters 3 --value=:'
run_occ 'config:system:set forbidden_filename_characters 4 --value=*'
run_occ 'config:system:set forbidden_filename_characters 5 --value=\|'
run_occ 'config:system:set forbidden_filename_characters 6 --value=\"'
}
upgrade_mariadb() {
mariadb-upgrade -p`cat /run/secrets/db_root_password`
}

24
alaconnect.yml Normal file
View File

@ -0,0 +1,24 @@
authentik:
uncomment:
- compose.authentik.yml
- AUTHENTIK_USER_PREFIX
- AUTHENTIK_DOMAIN
- SECRET_AUTHENTIK_SECRET_VERSION
- SECRET_AUTHENTIK_ID_VERSION
initial-hooks:
- app set_authentik
shared_secrets:
nextcloud_secret: authentik_secret
nextcloud_id: authentik_id
onlyoffice:
uncomment:
- compose.onlyoffice.yml
- ONLYOFFICE_URL
- SECRET_ONLYOFFICE_JWT_VERSION
initial-hooks:
- app install_onlyoffice
collabora:
uncomment:
- COLLABORA_URL
initial-hooks:
- app install_collabora

12
compose.bbb.yml Normal file
View File

@ -0,0 +1,12 @@
version: "3.8"
services:
app:
secrets:
- bbb_secret
environment:
- BBB_URL
secrets:
bbb_secret:
external: true
name: ${STACK_NAME}_bbb_secret_${SECRET_BBB_SECRET_VERSION}

View File

@ -0,0 +1,55 @@
version: "3.8"
services:
elasticsearch:
image: "docker.elastic.co/elasticsearch/elasticsearch:8.17.2"
environment:
- cluster.name=docker-cluster
- bootstrap.memory_lock=true
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
- discovery.type=single-node
# Disable authentication and ssl completely
# - xpack.security.enabled=false
# Use this to enable Basic Authentication:
- xpack.security.enabled=true
- xpack.security.http.ssl.enabled=false
- ELASTIC_PASSWORD_FILE=/var/run/secrets/elasticsearch_password
ulimits:
memlock:
soft: -1
hard: -1
volumes:
- elasticsearch:/usr/share/elasticsearch/data
networks:
- internal
secrets:
- source: elasticsearch_password
uid: "1000"
gid: "1000"
mode: 0600
searchindexer:
image: nextcloud:30.0.6-fpm
volumes:
- nextcloud:/var/www/html/
- nextapps:/var/www/html/custom_apps:cached
- nextdata:/var/www/html/data:cached
- nextconfig:/var/www/html/config:cached
- ${EXTRA_VOLUME}
networks:
- internal
entrypoint: su -p www-data -s /bin/sh -c '/var/www/html/occ fulltextsearch:live'
# Add the secret to the app service so it is avaiable in the
# install_fulltextsearch command
app:
secrets:
- elasticsearch_password
secrets:
elasticsearch_password:
external: true
name: ${STACK_NAME}_elasticsearch_password_${SECRET_ELASTICSEARCH_PASSWORD_VERSION}
volumes:
elasticsearch:

View File

@ -9,12 +9,13 @@ services:
- MYSQL_PASSWORD_FILE=/run/secrets/db_password
db:
image: "mariadb:10.5"
image: "mariadb:11.4"
environment:
- MYSQL_DATABASE=nextcloud
- MYSQL_USER=nextcloud
- MYSQL_PASSWORD_FILE=/run/secrets/db_password
- MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
- MAX_DB_CONNECTIONS=${MAX_DB_CONNECTIONS:-100}
configs:
- source: my_tune
target: /etc/mysql/conf.d/my-tune.cnf
@ -27,12 +28,11 @@ services:
- internal
deploy:
labels:
backupbot.backup: "true"
backupbot.backup.pre-hook: 'mysqldump --single-transaction -u root -p"$$(cat /run/secrets/db_root_password)" nextcloud > /var/lib/mysql/backup.sql'
backupbot.backup.post-hook: "rm -rf /var/lib/mysql/backup.sql"
backupbot.backup.path: "/var/lib/mysql/backup.sql"
backupbot.backup.pre-hook: 'mariadb-dump --single-transaction -u root -p"$$(cat /run/secrets/db_root_password)" nextcloud > /var/lib/mysql/backup.sql'
backupbot.backup.volumes.mariadb.path: "backup.sql"
backupbot.restore.post-hook: 'mariadb -u root -p"$$(cat /run/secrets/db_root_password)" nextcloud < /var/lib/mysql/backup.sql'
healthcheck:
test: ["CMD-SHELL", 'mysqladmin -p"$$(cat /run/secrets/db_root_password)" ping']
test: ["CMD-SHELL", 'mariadb-admin -p"$$(cat /run/secrets/db_root_password)" ping']
interval: 30s
timeout: 10s
retries: 10
@ -41,6 +41,12 @@ configs:
my_tune:
name: ${STACK_NAME}_my_cnf_${MY_CNF_VERSION}
file: my-tune.cnf
template_driver: golang
secrets:
db_root_password:
external: true
name: ${STACK_NAME}_db_root_password_${SECRET_DB_ROOT_PASSWORD_VERSION}
volumes:
mariadb:

View File

@ -3,16 +3,10 @@ services:
app:
secrets:
- onlyoffice_jwt
- bbb_secret
environment:
- APPS
- ONLYOFFICE_URL
- BBB_URL
secrets:
onlyoffice_jwt:
external: true
name: ${STACK_NAME}_onlyoffice_jwt_${SECRET_ONLYOFFICE_JWT_VERSION}
bbb_secret:
external: true
name: ${STACK_NAME}_bbb_secret_${SECRET_BBB_SECRET_VERSION}

View File

@ -10,7 +10,8 @@ services:
- NEXTCLOUD_UPDATE=1
db:
image: "postgres:12"
image: "postgres:13"
command: -c "max_connections=${MAX_DB_CONNECTIONS:-100}"
volumes:
- "postgres:/var/lib/postgresql/data"
networks:
@ -28,10 +29,18 @@ services:
retries: 5
deploy:
labels:
backupbot.backup: "true"
backupbot.backup.pre-hook: "PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /var/lib/postgresql/data/backup.sql"
backupbot.backup.post-hook: "rm -rf /var/lib/postgresql/data/backup.sql"
backupbot.backup.path: "/var/lib/postgresql/data/"
backupbot.backup.pre-hook: "/pg_backup.sh backup"
backupbot.backup.volumes.postgres.path: "backup.sql"
backupbot.restore.post-hook: '/pg_backup.sh restore'
configs:
- source: pg_backup
target: /pg_backup.sh
mode: 0555
volumes:
postgres:
configs:
pg_backup:
name: ${STACK_NAME}_pg_backup_${PG_BACKUP_VERSION}
file: pg_backup.sh

44
compose.whiteboard.yml Normal file
View File

@ -0,0 +1,44 @@
version: "3.8"
services:
app:
secrets:
- whiteboard_jwt
whiteboard:
image: ghcr.io/nextcloud-releases/whiteboard:v1.0.5
deploy:
labels:
- traefik.enable=true
- traefik.docker.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
- traefik.http.routers.${STACK_NAME}_whiteboard.tls.certresolver=${LETS_ENCRYPT_ENV}
- traefik.http.middlewares.${STACK_NAME}_whiteboard-stripprefix.stripprefix.prefixes=/whiteboard
- traefik.http.routers.${STACK_NAME}_whiteboard.middlewares=${STACK_NAME}_whiteboard-stripprefix
configs:
- source: entrypoint_whiteboard
target: /custom-entrypoint.sh
entrypoint: ["sh", "/custom-entrypoint.sh"]
user: root
networks:
- proxy
ports:
- 3002:3002
secrets:
- whiteboard_jwt
environment:
- NEXTCLOUD_URL=https://$DOMAIN
- JWT_SECRET_KEY_FILE=/run/secrets/whiteboard_jwt
secrets:
whiteboard_jwt:
external: true
name: ${STACK_NAME}_whiteboard_jwt_${SECRET_WHITEBOARD_JWT_VERSION}
configs:
entrypoint_whiteboard:
name: ${STACK_NAME}_entrypoint_whiteboard_${ENTRYPOINT_WHITEBOARD_VERSION}
file: entrypoint.whiteboard.sh.tmpl
template_driver: golang

View File

@ -1,7 +1,7 @@
version: "3.8"
services:
web:
image: nginx:1.25.3
image: nginx:1.27.4
depends_on:
- app
configs:
@ -46,7 +46,7 @@ services:
start_period: 5m
app:
image: nextcloud:27.1.3-fpm
image: nextcloud:30.0.6-fpm
depends_on:
- db
configs:
@ -91,10 +91,12 @@ services:
failure_action: rollback
order: start-first
labels:
- "coop-cloud.${STACK_NAME}.version=5.1.0+27.1.3-fpm"
- "coop-cloud.${STACK_NAME}.version=11.3.0+30.0.6-fpm"
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
- "backupbot.backup=true"
- "backupbot.backup.path=/var/www/html/config/,/var/www/html/data/,/var/www/html/custom_apps/"
- "backupbot.backup=${ENABLE_BACKUPS:-true}"
- "backupbot.backup.volumes.redis=false"
#- "backupbot.backup.volumes.nextcloud=false"
healthcheck:
test: ["CMD-SHELL", 'SCRIPT_NAME=status SCRIPT_FILENAME=/var/www/html/status.php REQUEST_METHOD=GET cgi-fcgi -bind -connect 127.0.0.1:9000 | grep "installed\":true"']
interval: 30s
@ -103,7 +105,7 @@ services:
start_period: 15m
cron:
image: nextcloud:27.1.3-fpm
image: nextcloud:30.0.6-fpm
volumes:
- nextcloud:/var/www/html/
- nextapps:/var/www/html/custom_apps:cached
@ -113,9 +115,13 @@ services:
networks:
- internal
entrypoint: /cron.sh
configs:
- source: crontab
target: /var/spool/cron/crontabs/www-data
cache:
image: redis:7.2.3-alpine
image: redis:7.4.2-alpine
networks:
- internal
volumes:
@ -127,9 +133,6 @@ services:
retries: 20
secrets:
db_root_password:
external: true
name: ${STACK_NAME}_db_root_password_${SECRET_DB_ROOT_PASSWORD_VERSION}
db_password:
external: true
name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
@ -158,6 +161,9 @@ configs:
name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION}
file: entrypoint.sh.tmpl
template_driver: golang
crontab:
name: ${STACK_NAME}_crontab_${CRONTAB_VERSION}
file: crontab
networks:
proxy:

1
crontab Normal file
View File

@ -0,0 +1 @@
*/5 * * * * php -d memory_limit=1G -f /var/www/html/cron.php

View File

@ -0,0 +1,6 @@
#!/bin/sh
set -e
export JWT_SECRET_KEY=$(cat /run/secrets/whiteboard_jwt)
exec npm run server:start

View File

@ -13,7 +13,7 @@ key_buffer_size = 16M
innodb_log_file_size = 256M
long_query_time = 1
max_allowed_packet = 256M
max_connections = 100
max_connections = {{ env "MAX_DB_CONNECTIONS" }}
max_heap_table_size = 64M
max_user_connections = 0
myisam_recover_options = BACKUP

View File

@ -11,6 +11,10 @@ events {
http {
include /etc/nginx/mime.types;
# See https://github.com/nextcloud/forms/issues/1838#issuecomment-1860497200
types {
application/javascript js mjs;
}
default_type application/octet-stream;
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
@ -63,7 +67,7 @@ http {
add_header X-Content-Type-Options "nosniff" always;
add_header X-Download-Options "noopen" always;
add_header X-Permitted-Cross-Domain-Policies "none" always;
add_header X-Robots-Tag "none" always;
add_header X-Robots-Tag "noindex, nofollow" always;
add_header X-XSS-Protection "1; mode=block" always;
{{ if eq (env "X_FRAME_OPTIONS_ENABLED") "1" }}
@ -132,6 +136,9 @@ http {
# then Nginx will encounter an infinite rewriting loop when it prepends `/index.php`
# to the URI, resulting in a HTTP 500 error response.
location ~ \.php(?:$|/) {
# Required for legacy support
rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode(_arm64)?\/proxy) /index.php$request_uri;
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
set $path_info $fastcgi_path_info;

34
pg_backup.sh Normal file
View File

@ -0,0 +1,34 @@
#!/bin/bash
set -e
BACKUP_FILE='/var/lib/postgresql/data/backup.sql'
function backup {
export PGPASSWORD=$(cat /run/secrets/db_password)
pg_dump -U ${POSTGRES_USER} ${POSTGRES_DB} > $BACKUP_FILE
}
function restore {
cd /var/lib/postgresql/data/
restore_config(){
# Restore allowed connections
cat pg_hba.conf.bak > pg_hba.conf
su postgres -c 'pg_ctl reload'
}
# Don't allow any other connections than local
cp pg_hba.conf pg_hba.conf.bak
echo "local all all trust" > pg_hba.conf
su postgres -c 'pg_ctl reload'
trap restore_config EXIT INT TERM
# Recreate Database
psql -U ${POSTGRES_USER} -d postgres -c "DROP DATABASE ${POSTGRES_DB} WITH (FORCE);"
createdb -U ${POSTGRES_USER} ${POSTGRES_DB}
psql -U ${POSTGRES_USER} -d ${POSTGRES_DB} -1 -f $BACKUP_FILE
trap - EXIT INT TERM
restore_config
}
$@

View File

@ -0,0 +1 @@
https://docs.nextcloud.com/server/latest/admin_manual/release_notes/upgrade_to_30.html

View File

@ -0,0 +1,4 @@
Upgrades mariadb from 10.5 to 11.4
NOTE: If your Nextcloud instance is using mariadb, after running this update you MUST run the database upgrade command:
`abra app command nextcloud.yourserver.org db upgrade_mariadb`
More info: https://mariadb.com/kb/en/upgrading-from-mariadb-10-11-to-mariadb-11-4/

1
release/8.0.0+29.0.1-fpm Normal file
View File

@ -0,0 +1 @@
BREAKING CHANGE: compose.apps.yml is now split for bbb and onlyoffice, configs must be updated

1
release/9.1.0+29.0.5-fpm Normal file
View File

@ -0,0 +1 @@
Added automated customization options. Config needs to be updated to be able to use it.