From b368102bd58fd40ba9850ec866667019d3e5e5f3 Mon Sep 17 00:00:00 2001
From: Matthias Stecher <matthiasstecher@gmx.de>
Date: Sun, 25 Oct 2020 20:29:57 +0100
Subject: [PATCH] __nextcloud: misc adjustments

Mostly to the manpage, but some minor fixes, too.
---
 type/__nextcloud/gencode-remote      |  2 +-
 type/__nextcloud/man.rst             | 13 ++++++++++++-
 type/__nextcloud/map-conf-changes.sh |  2 ++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/type/__nextcloud/gencode-remote b/type/__nextcloud/gencode-remote
index 38024a6..1850dd0 100755
--- a/type/__nextcloud/gencode-remote
+++ b/type/__nextcloud/gencode-remote
@@ -17,7 +17,7 @@ occ() {
     #  will not use -q as it supresses errors, too
     cat << SHELL
 su -s /bin/sh -l "$user" -- -e <<SU
-cd '$installdir' && php occ --no-interaction $@
+cd '$installdir' && php occ --no-interaction --no-ansi $@
 SU
 SHELL
 }
diff --git a/type/__nextcloud/man.rst b/type/__nextcloud/man.rst
index ba4d8c4..9daa4ce 100644
--- a/type/__nextcloud/man.rst
+++ b/type/__nextcloud/man.rst
@@ -22,6 +22,11 @@ version
     installed version lower, it will upgrade nextcloud if ``--install-only`` is
     not set.
 
+    You get version numbers from the `official changelog
+    <https://nextcloud.com/changelog/>`_ or from the `GitHub Releases
+    <https://github.com/nextcloud/server/releases>`_ page. The type will
+    download the tarball over the official nextcloud website.
+
     The type will never downgrade a nextcloud instance. Rather, it will fail,
     as this is a missconfiguration. Downgrades are not recommended and
     supported by upstream. Such cases can happen if the nextcloud instance was
@@ -255,13 +260,19 @@ it is not handled for the following cases:
     do not delete configuration options and set all available nextcloud options
     that are available through this type.
 
+If the nextcloud installation does not work and you stuck in a plaintext error
+screen, try to restart your Apache WWW server first! This type will install all
+php dependencies, but there are not recognised by the server-internal php
+environment. This can happen after a database migration between different
+database types, as it installs the database module only when it is required.
+
 
 AUTHORS
 -------
 Matthias Stecher <matthiasstecher at gmx.de>
 
 
-COPYRIGHT
+COPYING
 ---------
 Copyright \(C) 2020 Matthias Stecher. You can redistribute it
 and/or modify it under the terms of the GNU General Public License as
diff --git a/type/__nextcloud/map-conf-changes.sh b/type/__nextcloud/map-conf-changes.sh
index 3c98c3b..caad3bd 100755
--- a/type/__nextcloud/map-conf-changes.sh
+++ b/type/__nextcloud/map-conf-changes.sh
@@ -230,6 +230,7 @@ migrate_db() {
         database_port="${database_host##*:}"
     else
         # set default port because the tool can not do this for pgsql
+        # it looks like mysql get struggles, too
         case "$database_type" in
             mysql)
                 database_port=3306
@@ -244,6 +245,7 @@ migrate_db() {
     printf "php occ db:convert-type --no-interaction --no-ansi --clear-schema --all-apps \
         '%s' '%s' --password '%s' '%s' --port '%u' '%s'\n" \
         "$database_type" "$database_user" "$database_pass" "$database_host" "$database_port" "$database_name"
+    printf "php occ maintenance:mode --on\n"  # was disabled by database convertion
 }