Compare commits

..

7 Commits

7 changed files with 25 additions and 21 deletions

View File

@ -1,5 +1,5 @@
TYPE=nextcloud
TIMEOUT=500
TIMEOUT=900
ENABLE_AUTO_UPDATE=true
DOMAIN=nextcloud.example.com
@ -11,8 +11,6 @@ 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
@ -50,6 +48,8 @@ DEFAULT_QUOTA="10 GB"
# ONLYOFFICE_URL=https://onlyoffice.example.com
# SECRET_ONLYOFFICE_JWT_VERSION=v1
#
# COLLABORA_URL=https://collabora.example.com
#
# BBB_URL=https://talk.example.org/bigbluebutton/ # trailing slash!
# SECRET_BBB_SECRET_VERSION=v1
#

View File

@ -1,8 +1,8 @@
#!/bin/bash
export FPM_TUNE_VERSION=v5
export NGINX_CONF_VERSION=v4
export MY_CNF_VERSION=v5
export NGINX_CONF_VERSION=v5
export MY_CNF_VERSION=v4
export ENTRYPOINT_VERSION=v3
run_occ() {
@ -65,6 +65,11 @@ install_onlyoffice() {
set_app_config onlyoffice customizationForcesave true
}
install_collabora() {
install_apps richdocuments
set_app_config richdocuments wopi_url "$COLLABORA_URL"
}
set_default_quota() {
set_app_config files default_quota "$DEFAULT_QUOTA"
}

View File

@ -15,7 +15,6 @@ services:
- 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
@ -42,7 +41,6 @@ configs:
my_tune:
name: ${STACK_NAME}_my_cnf_${MY_CNF_VERSION}
file: my-tune.cnf
template_driver: golang
volumes:
mariadb:

View File

@ -11,7 +11,6 @@ services:
db:
image: "postgres:12"
command: -c "max_connections=${MAX_DB_CONNECTIONS:-100}"
volumes:
- "postgres:/var/lib/postgresql/data"
networks:

View File

@ -1,7 +1,9 @@
version: "3.8"
services:
web:
image: nginx:1.25.1
image: nginx:1.25.3
depends_on:
- app
configs:
- source: nginx_conf
target: /etc/nginx/nginx.conf
@ -44,7 +46,7 @@ services:
start_period: 5m
app:
image: nextcloud:27.0.1-fpm
image: nextcloud:27.1.5-fpm
depends_on:
- db
configs:
@ -89,7 +91,7 @@ services:
failure_action: rollback
order: start-first
labels:
- "coop-cloud.${STACK_NAME}.version=5.0.3+27.0.1-fpm"
- "coop-cloud.${STACK_NAME}.version=5.1.1+27.1.5-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/"
@ -98,10 +100,10 @@ services:
interval: 30s
timeout: 10s
retries: 10
start_period: 5m
start_period: 15m
cron:
image: nextcloud:27.0.1-fpm
image: nextcloud:27.1.5-fpm
volumes:
- nextcloud:/var/www/html/
- nextapps:/var/www/html/custom_apps:cached
@ -113,7 +115,7 @@ services:
entrypoint: /cron.sh
cache:
image: redis:7.0.12-alpine
image: redis:7.2.3-alpine
networks:
- internal
volumes:

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 = {{ env "MAX_DB_CONNECTIONS" }}
max_connections = 100
max_heap_table_size = 64M
max_user_connections = 0
myisam_recover_options = BACKUP

View File

@ -59,12 +59,12 @@ http {
#pagespeed off;
# HTTP response headers borrowed from Nextcloud `.htaccess`
add_header Referrer-Policy "no-referrer" always;
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-XSS-Protection "1; mode=block" always;
add_header Referrer-Policy "no-referrer" always;
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 "noindex, nofollow" always;
add_header X-XSS-Protection "1; mode=block" always;
{{ if eq (env "X_FRAME_OPTIONS_ENABLED") "1" }}
add_header Content-Security-Policy "frame-ancestors {{ env "X_FRAME_OPTIONS_ALLOW_FROM" }} {{ env "DOMAIN" }}";