upgrade to NC14.0.4v0.67.0

6 files changed, 16 insertions, 15 deletions

diff --git a/README.md b/README.md
index b3157c6d..42ee5add 100644
--- a/README.md
+++ b/README.md
@@ -11,13 +11,12 @@ This code also generates the [NextCloudPi docker images](https://hub.docker.com/
 
 ## Features
 
- * Raspbian 9 stretch
- * Nextcloud 14.0.3
+ * Debian/Raspbian 9 stretch
+ * Nextcloud 14.0.4
  * Apache 2.4.25, with HTTP2 enabled
  * PHP 7.2
  * MariaDB 10
  * Redis memory cache ( NEW 11-12-2017 )
- * 4.9 Linux Kernel ( NEW 03-13-2017 )
  * ncp-config for easy setup ( RAM logs, USB drive and more )
  * Automatic redirection to HTTPS
  * ACPU PHP cache
diff --git a/changelog.md b/changelog.md
index 18b969f1..b82757a7 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,7 @@
 
-[v0.66.6](https://github.com/nextcloud/nextcloudpi/commit/c2eaf06) (2018-11-18) nc-static-IP: clarify usage
+[v0.67.0](https://github.com/nextcloud/nextcloudpi/commit/56ef7da) (2018-11-22) upgrade to NC14.0.4
+
+[v0.66.6](https://github.com/nextcloud/nextcloudpi/commit/5aeb83c) (2018-11-18) nc-static-IP: clarify usage
 
 [v0.66.4](https://github.com/nextcloud/nextcloudpi/commit/f3666d6) (2018-11-11) build: package php7.2-imagick now available
 
diff --git a/etc/ncp-config.d/nc-autoupdate-nc.sh b/etc/ncp-config.d/nc-autoupdate-nc.sh
index a090fb1e..1f6d5d18 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.3
+VERSION=14.0.4
 
 configure() 
 {
diff --git a/etc/ncp-config.d/nc-nextcloud.sh b/etc/ncp-config.d/nc-nextcloud.sh
index 0b930b36..5ac9540f 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.3
+VER_=14.0.4
 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 b172a93d..664baad6 100644
--- a/etc/ncp-config.d/nc-update-nextcloud.sh
+++ b/etc/ncp-config.d/nc-update-nextcloud.sh
@@ -9,7 +9,7 @@
 #
 
 VERSION_=0
-LATEST=14.0.3
+LATEST=14.0.4
 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 ca56abea..30f53c14 100755
--- a/update.sh
+++ b/update.sh
@@ -149,14 +149,6 @@ EOF
   install_script nc-restore.sh
   cd -          &>/dev/null
 
-  # update to NC14.0.3
-  F="$CONFDIR"/nc-autoupdate-nc.sh
-  grep -q '^ACTIVE_=yes$' "$F" && {
-    cd "$CONFDIR" &>/dev/null
-    activate_script nc-autoupdate-nc.sh
-    cd -          &>/dev/null
-  }
-
       # Redis eviction policy
       grep -q "^maxmemory-policy allkeys-lru" /etc/redis/redis.conf || {
         sed -i 's|# maxmemory-policy .*|maxmemory-policy allkeys-lru|' /etc/redis/redis.conf
@@ -230,6 +222,14 @@ EOF
   # Update php imagick
   apt-get install -y --no-install-recommends imagemagick php7.2-imagick php7.2-exif
 
+  # update to NC14.0.4
+  F="$CONFDIR"/nc-autoupdate-nc.sh
+  grep -q '^ACTIVE_=yes$' "$F" && {
+    cd "$CONFDIR" &>/dev/null
+    activate_script nc-autoupdate-nc.sh
+    cd -          &>/dev/null
+  }
+
 } # end - only live updates
 
 exit 0