From 15815e07ffd2448c12a296cba52af53962ba9685 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Mon, 13 Oct 2025 14:29:27 -0400
Subject: [PATCH 1/2] add deps and a retry

---
 .../svc-mod-nextcloud-notify-push-set-url/run       | 13 ++++++++++---
 .../dependencies.d/{init-services => svc-nginx}     |  0
 .../dependencies.d/svc-php-fpm                      |  0
 3 files changed, 10 insertions(+), 3 deletions(-)
 rename root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-notify-push/dependencies.d/{init-services => svc-nginx} (100%)
 create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-notify-push/dependencies.d/svc-php-fpm

diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-notify-push-set-url/run b/root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-notify-push-set-url/run
index 728aaf7..79199a6 100755
--- a/root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-notify-push-set-url/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-notify-push-set-url/run
@@ -2,7 +2,14 @@
 # shellcheck shell=bash
 
 NOTIFY_PUSH_URL=$(echo "$(occ config:system:get overwrite.cli.url)/push")
+RETRY=0
 echo "**** Setting notify_push server URL to ${NOTIFY_PUSH_URL} ****"
-if ! occ notify_push:setup "${NOTIFY_PUSH_URL}"; then
-    echo "**** There was an error setting the notify_push server URL. Please double check your reverse proxy settings as well as the overwrite.cli.url entry in Nextcloud's config.php ****"
-fi
+while ! occ notify_push:setup "${NOTIFY_PUSH_URL}"; do
+    RETRY=$((${RETRY} + 1))
+    if [[ "${RETRY}" -lt 6 ]]; then
+        sleep 3
+    else
+        echo "**** There was an error setting the notify_push server URL. Please double check your reverse proxy settings as well as the overwrite.cli.url entry in Nextcloud's config.php ****"
+        break
+    fi
+done
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-notify-push/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-notify-push/dependencies.d/svc-nginx
similarity index 100%
rename from root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-notify-push/dependencies.d/init-services
rename to root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-notify-push/dependencies.d/svc-nginx
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-notify-push/dependencies.d/svc-php-fpm b/root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-notify-push/dependencies.d/svc-php-fpm
new file mode 100644
index 0000000..e69de29

From 402b493de928269cb6877d31512343d530fd9456 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Mon, 13 Oct 2025 15:13:01 -0400
Subject: [PATCH 2/2] improve verbosity

---
 .../s6-overlay/s6-rc.d/svc-mod-nextcloud-notify-push-set-url/run | 1 +
 1 file changed, 1 insertion(+)

diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-notify-push-set-url/run b/root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-notify-push-set-url/run
index 79199a6..39573e4 100755
--- a/root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-notify-push-set-url/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-mod-nextcloud-notify-push-set-url/run
@@ -7,6 +7,7 @@ echo "**** Setting notify_push server URL to ${NOTIFY_PUSH_URL} ****"
 while ! occ notify_push:setup "${NOTIFY_PUSH_URL}"; do
     RETRY=$((${RETRY} + 1))
     if [[ "${RETRY}" -lt 6 ]]; then
+        echo "**** Retrying notify_push setup ****"
         sleep 3
     else
         echo "**** There was an error setting the notify_push server URL. Please double check your reverse proxy settings as well as the overwrite.cli.url entry in Nextcloud's config.php ****"