From 81834b3851a934800e4d83daa147a89397f885f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20T=C3=A2che?= Date: Fri, 17 Apr 2026 21:23:39 +0200 Subject: [PATCH] Updates nextcloud, fixes wallabag, synapse --- home/root/rclone-parents.sh | 7 ++++++- home/wallabag/custom-entrypoint.sh | 6 ++++++ quadlets/nextcloud/nextcloud-cron.container | 2 +- quadlets/nextcloud/nextcloud.container | 6 +++--- quadlets/synapse/synapse-database.container | 2 +- quadlets/wallabag/wallabag.container | 2 ++ 6 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 home/wallabag/custom-entrypoint.sh diff --git a/home/root/rclone-parents.sh b/home/root/rclone-parents.sh index 088ef9f..76a6c8d 100644 --- a/home/root/rclone-parents.sh +++ b/home/root/rclone-parents.sh @@ -1,2 +1,7 @@ #!/bin/bash -/root/scripts/rclone --log-level INFO --log-file /var/log/rclone-parents.log sync --exclude nextcloud.log --exclude qbittorrent/storage/downloads/** --exclude jdownloader/storage/output/* --links /var/mnt/nas/containers encrypted-parents:Backup/containers +if [[ -d "/var/mnt/nas/containers" ]]; then + echo "Running rclone" + /root/scripts/rclone --log-level INFO --log-file /var/log/rclone-parents.log sync --exclude nextcloud.log --exclude qbittorrent/storage/downloads/** --exclude jdownloader/storage/output/* --links /var/mnt/n> +else + echo "Missing containers directory!" +fi diff --git a/home/wallabag/custom-entrypoint.sh b/home/wallabag/custom-entrypoint.sh new file mode 100644 index 0000000..7fa01dd --- /dev/null +++ b/home/wallabag/custom-entrypoint.sh @@ -0,0 +1,6 @@ +#!/bin/sh +set -o errexit -o noclobber -o nounset + +# ALSO https://github.com/wallabag/wallabag/issues/8360 +chown -R nobody:nobody /var/www/wallabag/app/config /var/www/wallabag/var /var/www/wallabag/data /var/www/wallabag/web || echo "Couldn't chown" +/entrypoint.sh wallabag diff --git a/quadlets/nextcloud/nextcloud-cron.container b/quadlets/nextcloud/nextcloud-cron.container index 5317177..ebd2c0e 100644 --- a/quadlets/nextcloud/nextcloud-cron.container +++ b/quadlets/nextcloud/nextcloud-cron.container @@ -12,7 +12,7 @@ AutoUpdate=registry ContainerName=nextcloud-cron Entrypoint=/cron.sh Environment=TZ=Europe/Zurich -Image=docker.io/nextcloud:32 +Image=docker.io/nextcloud:33 Label=io.containers.autoupdate=registry Pod=nextcloud.pod StartWithPod=true diff --git a/quadlets/nextcloud/nextcloud.container b/quadlets/nextcloud/nextcloud.container index 5320925..e4e9cf9 100644 --- a/quadlets/nextcloud/nextcloud.container +++ b/quadlets/nextcloud/nextcloud.container @@ -10,13 +10,13 @@ AutoUpdate=registry ContainerName=nextcloud Environment=MYSQL_DATABASE=nextcloud Environment=MYSQL_HOST=nextcloud-database -Environment=NEXTCLOUD_TRUSTED_DOMAINS=localhost host.containers.internal nextcloud.gtache.ch +Environment=NEXTCLOUD_TRUSTED_DOMAINS="localhost host.containers.internal nextcloud.gtache.ch" Environment=PHP_MEMORY_LIMIT=2048M Environment=PHP_UPLOAD_LIMIT=100G Environment=REDIS_HOST=nextcloud-redis -Environment=TRUSTED_PROXIES=192.168.0.0/16 172.16.0.0/12 169.254.0.0/16 10.0.0.0/8 +Environment=TRUSTED_PROXIES="192.168.0.0/16 172.16.0.0/12 169.254.0.0/16 10.0.0.0/8" Environment=TZ=Europe/Zurich -Image=docker.io/nextcloud:32 +Image=docker.io/nextcloud:33 Label=io.containers.autoupdate=registry Pod=nextcloud.pod Secret=database-user,type=env,target=MYSQL_USER diff --git a/quadlets/synapse/synapse-database.container b/quadlets/synapse/synapse-database.container index 179261d..0408805 100644 --- a/quadlets/synapse/synapse-database.container +++ b/quadlets/synapse/synapse-database.container @@ -6,7 +6,7 @@ AutoUpdate=registry ContainerName=synapse-database Environment=POSTGRES_USER=synapse Environment=POSTGRES_DB=synapse -Environment=POSTGRES_INITDB_ARGS=--encoding=UTF-8 --lc-collate=C --lc-ctype=C +Environment=POSTGRES_INITDB_ARGS="--encoding=UTF-8 --lc-collate=C --lc-ctype=C" Environment=TZ=Europe/Zurich HealthCmd=pg_isready -U synapse HealthInterval=30s diff --git a/quadlets/wallabag/wallabag.container b/quadlets/wallabag/wallabag.container index 58ce90f..1e563e3 100644 --- a/quadlets/wallabag/wallabag.container +++ b/quadlets/wallabag/wallabag.container @@ -8,6 +8,7 @@ Requires=wallabag-redis.container [Container] AutoUpdate=registry ContainerName=wallabag +Entrypoint=/custom-entrypoint.sh Environment=POSTGRES_DB=wallabag Environment=POSTGRES_USER=wallabag Environment=SYMFONY__ENV__DATABASE_DRIVER=pdo_pgsql @@ -34,6 +35,7 @@ StartWithPod=true Timezone=Europe/Zurich Volume=wallabag-data.volume:/var/www/wallabag/data Volume=wallabag-images.volume:/var/www/wallabag/web/assets/images +Volume=/var/mnt/nas/containers/wallabag/storage/custom-entrypoint.sh:/custom-entrypoint.sh [Service] Restart=always