From 8f491be4503c97c74eabf50c7f6522c87106a125 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Tue, 2 Apr 2024 15:05:35 -0400
Subject: [PATCH 1/4] Add support for the notify_push mod

---
 README.md                                          | 1 +
 readme-vars.yml                                    | 1 +
 root/defaults/nginx/site-confs/default.conf.sample | 5 +++++
 3 files changed, 7 insertions(+)

diff --git a/README.md b/README.md
index 1e2d22d..7c00622 100644
--- a/README.md
+++ b/README.md
@@ -317,6 +317,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **02.04.24:** - Existing users should update: site-confs/default.conf - Add support for the Client Push (notify_push) plugin and the [new mod](https://github.com/linuxserver/docker-mods/tree/nextcloud-notify-push).
 * **22.03.24:** - Add imagemagick-svg module.
 * **06.03.24:** - Rebase to Alpine 3.19 with php 8.3.
 * **02.01.24:** - Existing users should update: site-confs/default.conf - Cleanup default site conf.
diff --git a/readme-vars.yml b/readme-vars.yml
index a4140af..a092944 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -81,6 +81,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "02.04.24:", desc: "Existing users should update: site-confs/default.conf - Add support for the Client Push (notify_push) plugin and the [new mod](https://github.com/linuxserver/docker-mods/tree/nextcloud-notify-push)."}
   - { date: "22.03.24:", desc: "Add imagemagick-svg module."}
   - { date: "06.03.24:", desc: "Rebase to Alpine 3.19 with php 8.3."}
   - { date: "02.01.24:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." }
diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample
index d036ea9..caff91e 100644
--- a/root/defaults/nginx/site-confs/default.conf.sample
+++ b/root/defaults/nginx/site-confs/default.conf.sample
@@ -156,6 +156,11 @@ server {
         return 301 /remote.php$request_uri;
     }
 
+    # Suuport for the Client Push (notify_push) plugin, needs mod installed https://github.com/linuxserver/docker-mods/tree/nextcloud-notify-push
+    location /push/ {
+        proxy_pass http://127.0.0.1:7867/;
+    }
+
     location / {
         # enable for basic auth
         #auth_basic "Restricted";

From 69c818dfe9642a52057c704ac917e21ab2a1a440 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Tue, 2 Apr 2024 15:07:52 -0400
Subject: [PATCH 2/4] update date and fix typo

---
 root/defaults/nginx/site-confs/default.conf.sample | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample
index caff91e..2ab42eb 100644
--- a/root/defaults/nginx/site-confs/default.conf.sample
+++ b/root/defaults/nginx/site-confs/default.conf.sample
@@ -1,4 +1,4 @@
-## Version 2024/01/03 - Changelog: https://github.com/linuxserver/docker-nextcloud/commits/master/root/defaults/nginx/site-confs/default.conf.sample
+## Version 2024/04/02 - Changelog: https://github.com/linuxserver/docker-nextcloud/commits/master/root/defaults/nginx/site-confs/default.conf.sample
 
 # Set the `immutable` cache control options only for assets with a cache busting `v` argument
 map $arg_v $asset_immutable {
@@ -156,7 +156,7 @@ server {
         return 301 /remote.php$request_uri;
     }
 
-    # Suuport for the Client Push (notify_push) plugin, needs mod installed https://github.com/linuxserver/docker-mods/tree/nextcloud-notify-push
+    # Support for the Client Push (notify_push) plugin, needs mod installed https://github.com/linuxserver/docker-mods/tree/nextcloud-notify-push
     location /push/ {
         proxy_pass http://127.0.0.1:7867/;
     }

From 17e9b76ae2a061ea971322deb446f20d150eb0e8 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Tue, 2 Apr 2024 15:20:22 -0400
Subject: [PATCH 3/4] use regex in location

---
 root/defaults/nginx/site-confs/default.conf.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample
index 2ab42eb..b70b193 100644
--- a/root/defaults/nginx/site-confs/default.conf.sample
+++ b/root/defaults/nginx/site-confs/default.conf.sample
@@ -157,7 +157,7 @@ server {
     }
 
     # Support for the Client Push (notify_push) plugin, needs mod installed https://github.com/linuxserver/docker-mods/tree/nextcloud-notify-push
-    location /push/ {
+    location ^~ /push/ {
         proxy_pass http://127.0.0.1:7867/;
     }
 

From f3a23468b834151959f9ecfe38ab49b8d737c60b Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Tue, 2 Apr 2024 17:00:13 -0400
Subject: [PATCH 4/4] add websocket support for notify_push

---
 root/defaults/nginx/site-confs/default.conf.sample | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample
index b70b193..b3e8ced 100644
--- a/root/defaults/nginx/site-confs/default.conf.sample
+++ b/root/defaults/nginx/site-confs/default.conf.sample
@@ -159,6 +159,9 @@ server {
     # Support for the Client Push (notify_push) plugin, needs mod installed https://github.com/linuxserver/docker-mods/tree/nextcloud-notify-push
     location ^~ /push/ {
         proxy_pass http://127.0.0.1:7867/;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "Upgrade";
     }
 
     location / {