Compare commits

..

1 Commits

Author SHA1 Message Date
1781bd818b split configs 2024-06-05 13:37:47 +02:00
7 changed files with 13 additions and 18 deletions

View File

@ -30,6 +30,8 @@ FPM_MAX_SPARE_SERVERS=12
DEFAULT_QUOTA="10 GB" DEFAULT_QUOTA="10 GB"
APPS="calendar"
# X_FRAME_OPTIONS_ENABLED=1 # X_FRAME_OPTIONS_ENABLED=1
# X_FRAME_OPTIONS_ALLOW_FROM=embedding-site.example.org # X_FRAME_OPTIONS_ALLOW_FROM=embedding-site.example.org
@ -44,8 +46,6 @@ DEFAULT_QUOTA="10 GB"
# MAIL_DOMAIN= # MAIL_DOMAIN=
# SECRET_SMTP_PASSWORD_VERSION=v1 # SECRET_SMTP_PASSWORD_VERSION=v1
# APPS="calendar"
# COLLABORA_URL=https://collabora.example.com # COLLABORA_URL=https://collabora.example.com
# COMPOSE_FILE="$COMPOSE_FILE:compose.onlyoffice.yml" # COMPOSE_FILE="$COMPOSE_FILE:compose.onlyoffice.yml"

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
export FPM_TUNE_VERSION=v5 export FPM_TUNE_VERSION=v5
export NGINX_CONF_VERSION=v7 export NGINX_CONF_VERSION=v6
export MY_CNF_VERSION=v5 export MY_CNF_VERSION=v5
export ENTRYPOINT_VERSION=v3 export ENTRYPOINT_VERSION=v3
export CRONTAB_VERSION=v1 export CRONTAB_VERSION=v1

View File

@ -5,20 +5,19 @@ authentik:
- AUTHENTIK_DOMAIN - AUTHENTIK_DOMAIN
- SECRET_AUTHENTIK_SECRET_VERSION - SECRET_AUTHENTIK_SECRET_VERSION
- SECRET_AUTHENTIK_ID_VERSION - SECRET_AUTHENTIK_ID_VERSION
initial-hooks: execute:
- app set_authentik - app set_authentik
shared_secrets: shared_secrets:
nextcloud_secret: authentik_secret nextcloud_secret: authentik_secret
nextcloud_id: authentik_id nextcloud_id: authentik_id
onlyoffice: onlyoffice:
uncomment: uncomment:
- compose.onlyoffice.yml
- ONLYOFFICE_URL - ONLYOFFICE_URL
- SECRET_ONLYOFFICE_JWT_VERSION - SECRET_ONLYOFFICE_JWT_VERSION
initial-hooks: execute:
- app install_onlyoffice - app install_onlyoffice
collabora: collabora:
uncomment: uncomment:
- COLLABORA_URL - COLLABORA_URL
initial-hooks: execute:
- app install_collabora - app install_collabora

View File

@ -2,7 +2,7 @@ version: "3.8"
services: services:
elasticsearch: elasticsearch:
image: "docker.elastic.co/elasticsearch/elasticsearch:8.14.3" image: "docker.elastic.co/elasticsearch/elasticsearch:8.11.3"
environment: environment:
- cluster.name=docker-cluster - cluster.name=docker-cluster
- bootstrap.memory_lock=true - bootstrap.memory_lock=true
@ -29,7 +29,7 @@ services:
mode: 0600 mode: 0600
searchindexer: searchindexer:
image: nextcloud:29.0.3-fpm image: nextcloud:29.0.0-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

View File

@ -1,7 +1,7 @@
version: "3.8" version: "3.8"
services: services:
web: web:
image: nginx:1.27.0 image: nginx:1.26.0
depends_on: depends_on:
- app - app
configs: configs:
@ -46,7 +46,7 @@ services:
start_period: 5m start_period: 5m
app: app:
image: nextcloud:29.0.3-fpm image: nextcloud:29.0.0-fpm
depends_on: depends_on:
- db - db
configs: configs:
@ -91,7 +91,7 @@ services:
failure_action: rollback failure_action: rollback
order: start-first order: start-first
labels: labels:
- "coop-cloud.${STACK_NAME}.version=8.0.1+29.0.3-fpm" - "coop-cloud.${STACK_NAME}.version=7.0.0+29.0.0-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/"
@ -103,7 +103,7 @@ services:
start_period: 15m start_period: 15m
cron: cron:
image: nextcloud:29.0.3-fpm image: nextcloud:29.0.0-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
@ -119,7 +119,7 @@ services:
cache: cache:
image: redis:7.2.5-alpine image: redis:7.2.4-alpine
networks: networks:
- internal - internal
volumes: volumes:

View File

@ -136,9 +136,6 @@ http {
# then Nginx will encounter an infinite rewriting loop when it prepends `/index.php` # then Nginx will encounter an infinite rewriting loop when it prepends `/index.php`
# to the URI, resulting in a HTTP 500 error response. # to the URI, resulting in a HTTP 500 error response.
location ~ \.php(?:$|/) { 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)(/.*)$; fastcgi_split_path_info ^(.+?\.php)(/.*)$;
set $path_info $fastcgi_path_info; set $path_info $fastcgi_path_info;

View File

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