From 60692fe9bc0a0098512c76f43360174af70fbe1a Mon Sep 17 00:00:00 2001
From: thecalcaholic <6317548+theCalcaholic@users.noreply.github.com>
Date: Wed, 20 Jul 2022 00:43:53 +0200
Subject: [PATCH] Fix notify_push sometimes using wrong URL

---
 bin/ncp-update-nc |  8 +++++---
 changelog.md      |  3 +++
 updates/1.48.2.sh | 30 ++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 updates/1.48.2.sh

diff --git a/bin/ncp-update-nc b/bin/ncp-update-nc
index 87128913..84698431 100755
--- a/bin/ncp-update-nc
+++ b/bin/ncp-update-nc
@@ -199,12 +199,14 @@ else
     cat > /etc/systemd/system/notify_push.service <<EOF
 [Unit]
 Description = Push daemon for Nextcloud clients
-After = mysql.service
+After=mysql.service
+After=redis.service
+Requires=redis.service
 
 [Service]
-Environment = PORT=7867
+Environment=PORT=7867
 Environment=NEXTCLOUD_URL=https://localhost
-ExecStart = /var/www/nextcloud/apps/notify_push/bin/"${arch}"/notify_push --allow-self-signed /var/www/nextcloud/config/config.php
+ExecStart=/var/www/nextcloud/apps/notify_push/bin/"${arch}"/notify_push --allow-self-signed /var/www/nextcloud/config/config.php
 User=www-data
 
 [Install]
diff --git a/changelog.md b/changelog.md
index b014b3a1..8a818d6d 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,4 +1,7 @@
+[v1.48.1](https://github.com/nextcloud/nextcloudpi/tree/v1.48.2) (2022-07-20) Fix notify_push using invalid domain; Fix Nextcloud v23.0.6 not being installed by default 
+
 [v1.48.1](https://github.com/nextcloud/nextcloudpi/tree/v1.48.1) (2022-06-12) Fix docker release missing latest tags
+
 [v1.48.0](https://github.com/nextcloud/nextcloudpi/tree/v1.48.0) (2022-06-12) Update Nextcloud to version 23.0.6
 
 [v1.47.2](https://github.com/nextcloud/nextcloudpi/commit/b66ce17) (2022-05-05) docker-build.yml: Add CI/CD integration tests for docker images
diff --git a/updates/1.48.2.sh b/updates/1.48.2.sh
new file mode 100644
index 00000000..42401dfc
--- /dev/null
+++ b/updates/1.48.2.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -e
+
+source /usr/local/etc/library.sh
+
+
+is_docker || {
+  arch="$(uname -m)"
+  [[ "${arch}" =~ "armv7" ]] && arch="armv7"
+  cat > /etc/systemd/system/notify_push.service <<EOF
+[Unit]
+Description = Push daemon for Nextcloud clients
+After=mysql.service
+After=redis.service
+Requires=redis.service
+
+[Service]
+Environment=PORT=7867
+Environment=NEXTCLOUD_URL=https://localhost
+ExecStart=/var/www/nextcloud/apps/notify_push/bin/"${arch}"/notify_push --allow-self-signed /var/www/nextcloud/config/config.php
+User=www-data
+
+[Install]
+WantedBy = multi-user.target
+EOF
+  start_notify_push
+}
+
+exit 0
\ No newline at end of file