From b4555bae1cd139c2967d9f518730cfae5e69ee55 Mon Sep 17 00:00:00 2001
From: nachoparker <nacho@ownyourbits.com>
Date: Thu, 11 Oct 2018 16:52:55 -0600
Subject: upgrade to NC14.0.2

---
 README.md                               |  2 +-
 bin/ncp-update-nc                       |  7 -------
 changelog.md                            | 15 +++++++++++++--
 etc/ncp-config.d/nc-autoupdate-nc.sh    |  2 +-
 etc/ncp-config.d/nc-nextcloud.sh        |  2 +-
 etc/ncp-config.d/nc-update-nextcloud.sh |  4 ++--
 update.sh                               |  2 +-
 7 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index c94c165d..5724b82b 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ This code also generates the [NextCloudPi docker images](https://hub.docker.com/
 ## Features
 
  * Raspbian 9 stretch
- * Nextcloud 14.0.1
+ * Nextcloud 14.0.2
  * Apache 2.4.25, with HTTP2 enabled
  * PHP 7.2
  * MariaDB 10
diff --git a/bin/ncp-update-nc b/bin/ncp-update-nc
index 3193dc77..6ac0d137 100755
--- a/bin/ncp-update-nc
+++ b/bin/ncp-update-nc
@@ -175,13 +175,6 @@ echo "Upgrade..."
 sudo -u www-data php nextcloud/occ upgrade      # && false # test point 
 sudo -u www-data php nextcloud/occ db:add-missing-indices
 
-# workaround for updating news to NC14 - bug https://github.com/nextcloud/news/issues/327
-[[ -e /var/www/nextcloud/apps/news ]] && {
-  F=/var/www/nextcloud/apps/news/vendor/ezyang/htmlpurifier/maintenance/.htaccess
-  [[ -f "$F" ]] || echo "Deny from all" > "$F" || true
-  sudo -u www-data php nextcloud/occ integrity:check-app --path=/var/www/nextcloud/apps/news news || true
-}
-
 # done
 ####################
 mkdir -p  "$DATADIR"/ncp-update-backups
diff --git a/changelog.md b/changelog.md
index ba33535c..52927810 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,17 @@
-[v0.62.6](https://github.com/nextcloud/nextcloudpi/commit/d069004) (2018-10-06) nc-limits: fix PHP service restart
 
-[v0.62.5](https://github.com/nextcloud/nextcloudpi/commit/0bf6045) (2018-10-03) nc-update-nc: dont fix the news app if there is no news app
+[v0.63.0](https://github.com/nextcloud/nextcloudpi/commit/37a44a9) (2018-10-11) upgrade to NC14.0.2
+
+[v0.62.10](https://github.com/nextcloud/nextcloudpi/commit/48ac238) (2018-10-07) limit logs size with logrotate
+
+[v0.62.9 ](https://github.com/nextcloud/nextcloudpi/commit/694a885) (2018-10-07) DDNS_spDYN reinstall DDNS_spDYN for use of IPv6 (#642)
+
+[v0.62.8 ](https://github.com/nextcloud/nextcloudpi/commit/c6da8a9) (2018-10-07) Use DIG instead of NSLOOKUP in DDNS apps (#666)
+
+[v0.62.7 ](https://github.com/nextcloud/nextcloudpi/commit/54e0968) (2018-10-07) nc-prettyURL: Catch failure of maintenance:update:htaccess (#654)
+
+[v0.62.6](https://github.com/nextcloud/nextcloudpi/commit/5e3d411) (2018-10-06) nc-limits: fix PHP service restart
+
+[v0.62.5 ](https://github.com/nextcloud/nextcloudpi/commit/0bf6045) (2018-10-03) nc-update-nc: dont fix the news app if there is no news app
 
 [v0.62.4 ](https://github.com/nextcloud/nextcloudpi/commit/aa886f9) (2018-10-03) nc-update-nextcloud: option to upgrade to the latest version
 
diff --git a/etc/ncp-config.d/nc-autoupdate-nc.sh b/etc/ncp-config.d/nc-autoupdate-nc.sh
index 4f9d90c8..75525f2e 100644
--- a/etc/ncp-config.d/nc-autoupdate-nc.sh
+++ b/etc/ncp-config.d/nc-autoupdate-nc.sh
@@ -13,7 +13,7 @@ NOTIFYUSER_=ncp
 DESCRIPTION="Automatically apply Nextcloud updates"
 
 # just change this value and re-activate in update.sh to upgrade users
-VERSION=14.0.1
+VERSION=14.0.2
 
 configure() 
 {
diff --git a/etc/ncp-config.d/nc-nextcloud.sh b/etc/ncp-config.d/nc-nextcloud.sh
index afcc7f71..c468634e 100644
--- a/etc/ncp-config.d/nc-nextcloud.sh
+++ b/etc/ncp-config.d/nc-nextcloud.sh
@@ -8,7 +8,7 @@
 # More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
 #
 
-VER_=14.0.1
+VER_=14.0.2
 BETA_=no
 MAXFILESIZE_=2G
 MEMORYLIMIT_=768M
diff --git a/etc/ncp-config.d/nc-update-nextcloud.sh b/etc/ncp-config.d/nc-update-nextcloud.sh
index 1ac83a2c..9ec47372 100644
--- a/etc/ncp-config.d/nc-update-nextcloud.sh
+++ b/etc/ncp-config.d/nc-update-nextcloud.sh
@@ -8,8 +8,8 @@
 # More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
 #
 
-VERSION_=14.0.1
-LATEST=14.0.1
+VERSION_=0
+LATEST=14.0.2
 DESCRIPTION="Update current instance to a new Nextcloud version"
 INFO="Set to 0 to update to the latest avaliable version"
 
diff --git a/update.sh b/update.sh
index f2f8ec82..9c43f281 100755
--- a/update.sh
+++ b/update.sh
@@ -185,7 +185,7 @@ EOF
     service mysql restart
   }
 
-  # update to NC14.0.1
+  # update to NC14.0.2
   F="$CONFDIR"/nc-autoupdate-nc.sh
   grep -q '^ACTIVE_=yes$' "$F" && {
     cd "$CONFDIR" &>/dev/null
-- 
cgit v1.2.3