From 0ff1df9b5c5b411941d1781587a91c65a8bd542f Mon Sep 17 00:00:00 2001
From: nachoparker <nacho@ownyourbits.com>
Date: Tue, 8 Jan 2019 20:27:17 -0700
Subject: upgrade to NC15

---
 README.md                            | 2 +-
 bin/ncp/CONFIG/nc-autoupdate-nc.sh   | 2 +-
 bin/ncp/CONFIG/nc-init.sh            | 5 +++--
 bin/ncp/TOOLS/nc-update-nextcloud.sh | 5 +++--
 etc/ncp-config.d/nc-nextcloud.cfg    | 2 +-
 update.sh                            | 2 +-
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 9592f205..259775b4 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ This code also generates the [NextCloudPi docker images](https://hub.docker.com/
 ## Features
 
  * Debian/Raspbian 9 stretch
- * Nextcloud 14.0.4
+ * Nextcloud 15.0.1
  * Apache 2.4.25, with HTTP2 enabled
  * PHP 7.2
  * MariaDB 10
diff --git a/bin/ncp/CONFIG/nc-autoupdate-nc.sh b/bin/ncp/CONFIG/nc-autoupdate-nc.sh
index 2e90b533..05aba5bd 100644
--- a/bin/ncp/CONFIG/nc-autoupdate-nc.sh
+++ b/bin/ncp/CONFIG/nc-autoupdate-nc.sh
@@ -10,7 +10,7 @@
 
 
 # just change this value and re-activate in update.sh to upgrade users
-VERSION=14.0.4
+VERSION=15.0.1
 
 configure() 
 {
diff --git a/bin/ncp/CONFIG/nc-init.sh b/bin/ncp/CONFIG/nc-init.sh
index 78fa05e9..fe285d57 100644
--- a/bin/ncp/CONFIG/nc-init.sh
+++ b/bin/ncp/CONFIG/nc-init.sh
@@ -143,7 +143,6 @@ EOF
   sudo -u www-data php /var/www/nextcloud/occ app:install notes
   sudo -u www-data php /var/www/nextcloud/occ app:install tasks
   sudo -u www-data php /var/www/nextcloud/occ app:install news
-  sudo -u www-data php /var/www/nextcloud/occ app:install admin_notifications
   sudo -u www-data php /var/www/nextcloud/occ app:install previewgenerator
 
   sudo -u www-data php /var/www/nextcloud/occ app:enable calendar
@@ -151,12 +150,14 @@ EOF
   sudo -u www-data php /var/www/nextcloud/occ app:enable notes
   sudo -u www-data php /var/www/nextcloud/occ app:enable tasks
   sudo -u www-data php /var/www/nextcloud/occ app:enable news
-  sudo -u www-data php /var/www/nextcloud/occ app:enable admin_notifications
   sudo -u www-data php /var/www/nextcloud/occ app:enable previewgenerator
 
   # other
   sudo -u www-data php /var/www/nextcloud/occ config:system:set overwriteprotocol --value=https
 
+  # TODO temporary workaround for https://github.com/nextcloud/server/pull/13358
+  sudo -u www-data php /var/www/nextcloud/occ -n db:convert-filecache-bigint
+
   echo "NC init done"
 }
 
diff --git a/bin/ncp/TOOLS/nc-update-nextcloud.sh b/bin/ncp/TOOLS/nc-update-nextcloud.sh
index b4eba81b..c7e0a5ac 100644
--- a/bin/ncp/TOOLS/nc-update-nextcloud.sh
+++ b/bin/ncp/TOOLS/nc-update-nextcloud.sh
@@ -8,12 +8,13 @@
 # More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
 #
 
-LATEST=14.0.4
+LATEST=15.0.1
 
 configure()
 {
   [[ "$VERSION" == "0" ]] && VERSION="$LATEST"
-  bash /usr/local/bin/ncp-update-nc "$VERSION"
+  bash /usr/local/bin/ncp-update-nc "$VERSION" && \
+  sudo -u www-data php /var/www/nextcloud/occ -n db:convert-filecache-bigint
 }
 
 install() { :; }
diff --git a/etc/ncp-config.d/nc-nextcloud.cfg b/etc/ncp-config.d/nc-nextcloud.cfg
index 176098c0..086ff26f 100644
--- a/etc/ncp-config.d/nc-nextcloud.cfg
+++ b/etc/ncp-config.d/nc-nextcloud.cfg
@@ -9,7 +9,7 @@
     {
       "id": "VER",
       "name": "Version",
-      "value": "14.0.4"
+      "value": "15.0.1"
     },
     {
       "id": "BETA",
diff --git a/update.sh b/update.sh
index 1f83edb6..5d7b6343 100755
--- a/update.sh
+++ b/update.sh
@@ -200,7 +200,7 @@ chmod 770                  /var/www/ncp-web
     sed -i "s|.* [* * * *]|*/5 * * * *|" spdnsupdater
   }
 
-  # update to NC14.0.4
+  # update to NC15
   is_active_app nc-autoupdate-nc && run_app nc-autoupdate-nc
 
   # remove redundant opcache configuration. Leave until update bug is fixed -> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815968
-- 
cgit v1.2.3