nextcloud: minor fixes

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

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

cookbooks/nextcloud/nextcloud-collabora.container

@@ -40,7 +40,7 @@ EnvironmentFile=/etc/quadlets/nextcloud/collabora.env
 # <none>
 
 # 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

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

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

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

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