From 63c6c41d3648869a87623cd2225f5a9994b2188f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Mass=C3=A9?= Date: Tue, 20 Oct 2026 07:54:19 +0000 Subject: [PATCH] nextcloud: minor fixes --- cookbooks/nextcloud/config/examples/config.env | 1 - cookbooks/nextcloud/nextcloud-app.container | 6 +++--- cookbooks/nextcloud/nextcloud-collabora.container | 2 +- cookbooks/nextcloud/nextcloud-cron.container | 4 ++-- cookbooks/nextcloud/nextcloud-init.container | 6 +++--- cookbooks/nextcloud/nextcloud-nginx.container | 4 ++-- cookbooks/nextcloud/nextcloud-upgrade.container | 6 +++--- 7 files changed, 14 insertions(+), 15 deletions(-) diff --git a/cookbooks/nextcloud/config/examples/config.env b/cookbooks/nextcloud/config/examples/config.env index eb05ea1..cc6c67b 100644 --- a/cookbooks/nextcloud/config/examples/config.env +++ b/cookbooks/nextcloud/config/examples/config.env @@ -4,7 +4,6 @@ # Major versions of all components NEXTCLOUD_MAJOR=31 -REDIS_MAJOR=8 NGINX_MAJOR=1.20 # Nextcloud domain configuration diff --git a/cookbooks/nextcloud/nextcloud-app.container b/cookbooks/nextcloud/nextcloud-app.container index 9ac8493..5adb79c 100644 --- a/cookbooks/nextcloud/nextcloud-app.container +++ b/cookbooks/nextcloud/nextcloud-app.container @@ -39,12 +39,12 @@ EnvironmentFile=/etc/quadlets/nextcloud/config.env # Volume mounts Volume=/var/lib/virtiofs/data/nextcloud:/var/www/html:z -Volume=/etc/quadlets/nextcloud/www.conf:/usr/local/etc/php-fpm.d/www.conf:Z -Volume=/run/quadlets/nextcloud/redis-session.ini:/usr/local/etc/php/conf.d/redis-session.ini:Z +Volume=/etc/quadlets/nextcloud/www.conf:/usr/local/etc/php-fpm.d/www.conf:z +Volume=/run/quadlets/nextcloud/redis-session.ini:/usr/local/etc/php/conf.d/redis-session.ini:z Volume=/etc/quadlets/nextcloud/custom-noinit.sh:/docker-entrypoint-hooks.d/pre-installation/custom.sh:z,ro # Health check (equivalent to readiness probe) -HealthCmd=nc -z localhost 9000 +HealthCmd=nc -z 127.0.0.1 9000 HealthInterval=30s HealthTimeout=10s HealthStartPeriod=60s diff --git a/cookbooks/nextcloud/nextcloud-collabora.container b/cookbooks/nextcloud/nextcloud-collabora.container index 3b28159..6c770ac 100644 --- a/cookbooks/nextcloud/nextcloud-collabora.container +++ b/cookbooks/nextcloud/nextcloud-collabora.container @@ -40,7 +40,7 @@ EnvironmentFile=/etc/quadlets/nextcloud/collabora.env # # Health check (equivalent to readiness probe) -HealthCmd=nc -z localhost 9980 +HealthCmd=/bin/bash -c 'p=9980; if /bin/true 5<> /dev/tcp/127.0.0.1/$p; then echo OK; else echo KO; exit 1; fi; exit 0' HealthInterval=30s HealthTimeout=10s HealthStartPeriod=10s diff --git a/cookbooks/nextcloud/nextcloud-cron.container b/cookbooks/nextcloud/nextcloud-cron.container index a04e520..49560b8 100644 --- a/cookbooks/nextcloud/nextcloud-cron.container +++ b/cookbooks/nextcloud/nextcloud-cron.container @@ -39,8 +39,8 @@ Exec=-f /var/www/html/cron.php # Volume mounts Volume=/var/lib/virtiofs/data/nextcloud:/var/www/html:z -Volume=/etc/quadlets/nextcloud/www.conf:/usr/local/etc/php-fpm.d/www.conf:Z -Volume=/run/quadlets/nextcloud/redis-session.ini:/usr/local/etc/php/conf.d/redis-session.ini:Z +Volume=/etc/quadlets/nextcloud/www.conf:/usr/local/etc/php-fpm.d/www.conf:z +Volume=/run/quadlets/nextcloud/redis-session.ini:/usr/local/etc/php/conf.d/redis-session.ini:z [Service] Restart=no diff --git a/cookbooks/nextcloud/nextcloud-init.container b/cookbooks/nextcloud/nextcloud-init.container index 56293c6..29d3227 100644 --- a/cookbooks/nextcloud/nextcloud-init.container +++ b/cookbooks/nextcloud/nextcloud-init.container @@ -39,12 +39,12 @@ Exec=/bin/true # Volume mounts Volume=/var/lib/virtiofs/data/nextcloud:/var/www/html:z -Volume=/etc/quadlets/nextcloud/www.conf:/usr/local/etc/php-fpm.d/www.conf:Z -Volume=/run/quadlets/nextcloud/redis-session.ini:/usr/local/etc/php/conf.d/redis-session.ini:Z +Volume=/etc/quadlets/nextcloud/www.conf:/usr/local/etc/php-fpm.d/www.conf:z +Volume=/run/quadlets/nextcloud/redis-session.ini:/usr/local/etc/php/conf.d/redis-session.ini:z [Service] Restart=no -TimeoutStartSec=600 +TimeoutStartSec=infinity # These environment variables are sourced to be used by systemd in the Exec* commands EnvironmentFile=/etc/quadlets/nextcloud/config.env diff --git a/cookbooks/nextcloud/nextcloud-nginx.container b/cookbooks/nextcloud/nextcloud-nginx.container index 2fb5c86..9a224bc 100644 --- a/cookbooks/nextcloud/nextcloud-nginx.container +++ b/cookbooks/nextcloud/nextcloud-nginx.container @@ -30,10 +30,10 @@ GIDMap=+101:10000:1 # Volume mounts Volume=/var/lib/virtiofs/data/nextcloud:/var/www/html:z -Volume=/etc/quadlets/nextcloud/nginx.conf:/etc/nginx/nginx.conf:ro +Volume=/etc/quadlets/nextcloud/nginx.conf:/etc/nginx/nginx.conf:z,ro # Health check (equivalent to readiness probe) -HealthCmd=curl -sSfL http://localhost/status.php +HealthCmd=curl -sSf http://127.0.0.1:8080/status.php HealthInterval=30s HealthTimeout=10s HealthStartPeriod=10s diff --git a/cookbooks/nextcloud/nextcloud-upgrade.container b/cookbooks/nextcloud/nextcloud-upgrade.container index e442db8..dc91e0c 100644 --- a/cookbooks/nextcloud/nextcloud-upgrade.container +++ b/cookbooks/nextcloud/nextcloud-upgrade.container @@ -41,12 +41,12 @@ Volume=/etc/quadlets/nextcloud/custom-post.sh:/docker-entrypoint-hooks.d/post-up # Volume mounts Volume=/var/lib/virtiofs/data/nextcloud:/var/www/html:z -Volume=/etc/quadlets/nextcloud/www.conf:/usr/local/etc/php-fpm.d/www.conf:Z -Volume=/run/quadlets/nextcloud/redis-session.ini:/usr/local/etc/php/conf.d/redis-session.ini:Z +Volume=/etc/quadlets/nextcloud/www.conf:/usr/local/etc/php-fpm.d/www.conf:z +Volume=/run/quadlets/nextcloud/redis-session.ini:/usr/local/etc/php/conf.d/redis-session.ini:z [Service] Restart=no -TimeoutStartSec=600 +TimeoutStartSec=infinity # These environment variables are sourced to be used by systemd in the Exec* commands EnvironmentFile=/etc/quadlets/nextcloud/config.env