From ba9fa67aaa678581671476aba3626e8ddd2d8bd5 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Mon, 6 Nov 2023 13:47:34 -0500
Subject: [PATCH 1/2] nextcloud-nginx.conf.j2: Patch both 'oc[ms]-provider' to
 'ocs-provider'

---
 roles/nextcloud/templates/nextcloud-nginx.conf.j2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/nextcloud/templates/nextcloud-nginx.conf.j2 b/roles/nextcloud/templates/nextcloud-nginx.conf.j2
index a1d1a53b3..285c6c8e2 100644
--- a/roles/nextcloud/templates/nextcloud-nginx.conf.j2
+++ b/roles/nextcloud/templates/nextcloud-nginx.conf.j2
@@ -85,7 +85,7 @@ location ^~ {{ nextcloud_url }} {
         deny all;
     }
 
-    location ~ ^\/nextcloud\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+)\.php(?:$|\/) {
+    location ~ ^\/nextcloud\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+)\.php(?:$|\/) {
         fastcgi_split_path_info ^(.+?\.php)(\/.*|)$;
         set $path_info $fastcgi_path_info;
         try_files $fastcgi_script_name =404;
@@ -102,7 +102,7 @@ location ^~ {{ nextcloud_url }} {
         fastcgi_request_buffering off;
     }
 
-    location ~ ^\/nextcloud\/(?:updater|oc[ms]-provider)(?:$|\/) {
+    location ~ ^\/nextcloud\/(?:updater|ocs-provider)(?:$|\/) {
         try_files $uri/ =404;
         index index.php;
     }

From 128088ea90e93601b894b22a3ef119f708df1fcc Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Mon, 6 Nov 2023 13:52:07 -0500
Subject: [PATCH 2/2] Desupport EOL'd Nextcloud 25, a year after its PHP 7 was
 (also!) EOL'd

---
 roles/nextcloud/tasks/install.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/roles/nextcloud/tasks/install.yml b/roles/nextcloud/tasks/install.yml
index 2eef6290f..09b72749f 100644
--- a/roles/nextcloud/tasks/install.yml
+++ b/roles/nextcloud/tasks/install.yml
@@ -118,10 +118,12 @@
     state: directory
     path: "{{ nextcloud_root_dir }}"    # /library/www/nextcloud
 
-- name: "2023-03-24: NEXTCLOUD 26 REQUIRES PHP 8 -- SO THIS TEMPORARY PATCH INSTALLS THE OLDER NEXTCLOUD 25 ON OS's WITH PHP 7.x -- WHOSE END-OF-LIFE WAS NOVEMBER 2022"
-  set_fact:
-    nextcloud_dl_url: https://download.nextcloud.com/server/releases/latest-25.tar.bz2
-  when: php_version is version('8.0', '<')
+# Nextcloud 25 EOL was 2023-10-01: https://endoflife.date/nextcloud
+# https://github.com/nextcloud/server/wiki/Maintenance-and-Release-Schedule#eol-versions
+#- name: "2023-03-24: NEXTCLOUD 26 REQUIRES PHP 8 -- SO THIS TEMPORARY PATCH INSTALLS THE OLDER NEXTCLOUD 25 ON OS's WITH PHP 7.x -- WHOSE END-OF-LIFE WAS NOVEMBER 2022"
+#  set_fact:
+#    nextcloud_dl_url: https://download.nextcloud.com/server/releases/latest-25.tar.bz2
+#  when: php_version is version('8.0', '<')
 
 - name: Unarchive {{ nextcloud_dl_url }} (~172 MB) to {{ nextcloud_root_dir }} (~607 MB initially, sometimes ~643 MB later, {{ apache_user }}:{{ apache_user }})
   unarchive: