Compare commits

...

7 Commits

4 changed files with 23 additions and 14 deletions

View File

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

View File

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

View File

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

View File

@ -63,7 +63,7 @@ http {
add_header X-Content-Type-Options "nosniff" always; add_header X-Content-Type-Options "nosniff" always;
add_header X-Download-Options "noopen" always; add_header X-Download-Options "noopen" always;
add_header X-Permitted-Cross-Domain-Policies "none" 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; add_header X-XSS-Protection "1; mode=block" always;
{{ if eq (env "X_FRAME_OPTIONS_ENABLED") "1" }} {{ if eq (env "X_FRAME_OPTIONS_ENABLED") "1" }}