nc-update-nextcloud: workaround news integrity bugv0.60.3

2 files changed, 11 insertions, 3 deletions

diff --git a/bin/ncp-update-nc b/bin/ncp-update-nc
index 7a2256a7..79a9eb8a 100755
--- a/bin/ncp-update-nc
+++ b/bin/ncp-update-nc
@@ -171,8 +171,12 @@ find nextcloud/ -type f -exec chmod 640 {} \;
 ####################
 echo "Upgrade..."
 sudo -u www-data php nextcloud/occ upgrade      # && false # test point 
+sudo -u www-data php nextcloud/occ db:add-missing-indices
 
-[[ -f nextcloud-old/.user.ini ]] && cp nextcloud-old/.user.ini nextcloud/
+# workaround for updating news to NC14 - bug https://github.com/nextcloud/news/issues/327
+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
 ####################
diff --git a/changelog.md b/changelog.md
index 9b661521..d853667b 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,7 +1,11 @@
 
-[v0.60.1](https://github.com/nextcloud/nextcloudpi/commit/2b80190) (2018-07-31) nc-restore: restore to volume in docker container
+[v0.60.3](https://github.com/nextcloud/nextcloudpi/commit/b4d7776) (2018-09-23) nc-update-nextcloud: workaround news integrity bug
 
-[v0.60.0, master](https://github.com/nextcloud/nextcloudpi/commit/e973397) (2018-09-22) add nc-previews
+[v0.60.2 ](https://github.com/nextcloud/nextcloudpi/commit/5914624) (2018-09-21) DDNS_spdyn.sh : Send new IP only when changed.
+
+[v0.60.1](https://github.com/nextcloud/nextcloudpi/commit/f80ee23) (2018-07-31) nc-restore: restore to volume in docker container
+
+[v0.60.0 ](https://github.com/nextcloud/nextcloudpi/commit/3a1b974) (2018-09-22) add nc-previews
 
 [v0.59.20](https://github.com/nextcloud/nextcloudpi/commit/4457485) (2018-09-21) autoupdate: log everything to ncp.log