sparrowhawk
/
cdist-contrib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

__nextcloud: misc adjustments 

Mostly to the manpage, but some minor fixes, too.
This commit is contained in:
matze 2020-10-25 20:29:57 +01:00
parent 77b530eefb
commit b368102bd5
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
type/__nextcloud/gencode-remote
View File

@ -17,7 +17,7 @@ occ() {
# will not use -q as it supresses errors, too # will not use -q as it supresses errors, too
cat << SHELL cat << SHELL
su -s /bin/sh -l "$user" -- -e <<SU su -s /bin/sh -l "$user" -- -e <<SU
cd '$installdir' && php occ --no-interaction $@ cd '$installdir' && php occ --no-interaction --no-ansi $@
SU SU
SHELL SHELL
} }

13
type/__nextcloud/man.rst
View File

@ -22,6 +22,11 @@ version
installed version lower, it will upgrade nextcloud if ``--install-only`` is installed version lower, it will upgrade nextcloud if ``--install-only`` is
not set. 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, The type will never downgrade a nextcloud instance. Rather, it will fail,
as this is a missconfiguration. Downgrades are not recommended and as this is a missconfiguration. Downgrades are not recommended and
supported by upstream. Such cases can happen if the nextcloud instance was 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 do not delete configuration options and set all available nextcloud options
that are available through this type. 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 AUTHORS
------- -------
Matthias Stecher <matthiasstecher at gmx.de> Matthias Stecher <matthiasstecher at gmx.de>
COPYRIGHT COPYING
--------- ---------
Copyright \(C) 2020 Matthias Stecher. You can redistribute it Copyright \(C) 2020 Matthias Stecher. You can redistribute it
and/or modify it under the terms of the GNU General Public License as and/or modify it under the terms of the GNU General Public License as

2
type/__nextcloud/map-conf-changes.sh
View File

@ -230,6 +230,7 @@ migrate_db() {
database_port="${database_host##*:}" database_port="${database_host##*:}"
else else
# set default port because the tool can not do this for pgsql # set default port because the tool can not do this for pgsql
# it looks like mysql get struggles, too
case "$database_type" in case "$database_type" in
mysql) mysql)
database_port=3306 database_port=3306
@ -244,6 +245,7 @@ migrate_db() {
printf "php occ db:convert-type --no-interaction --no-ansi --clear-schema --all-apps \ printf "php occ db:convert-type --no-interaction --no-ansi --clear-schema --all-apps \
'%s' '%s' --password '%s' '%s' --port '%u' '%s'\n" \ '%s' '%s' --password '%s' '%s' --port '%u' '%s'\n" \
"$database_type" "$database_user" "$database_pass" "$database_host" "$database_port" "$database_name" "$database_type" "$database_user" "$database_pass" "$database_host" "$database_port" "$database_name"
printf "php occ maintenance:mode --on\n" # was disabled by database convertion
} }