Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/univention-app.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/inst
diff options
context:
space:
mode:
authorNico Gulden <gulden@univention.de>2021-02-17 11:15:55 +0300
committerNico Gulden <gulden@univention.de>2021-02-17 11:53:32 +0300
commit6dcbcd8d598b7649d6252c92fd5a18f61107a468 (patch)
treed22328dfdbeeb9da7211a3bda0c228062e8647e9 /inst
parent42a1e29dfd69c4f71ff64eb43b492203c6f90171 (diff)
Remove online office fallback from join script
The join script installed the collabora binary to the Nextcloud Docker container, when no online office app like Collabora or ONLYOFFICE was detected on the system. The respective pieces of code have been removed from the join script. When the fallback was installed, it broke automatic configurations when the Collabora app was installed afterwards via the App Center. The wopi_url for Collabora was not changed, because it already had a valid value. Therefore, Nextcloud still used the Collabora binary installed inside the Nextcloud container, instead of the separate app in Univention App Center. For the administrator this is very confusing and time consuming in support cases. Signed-off-by: Nico Gulden <gulden@univention.de>
Diffstat (limited to 'inst')
-rw-r--r--inst16
1 files changed, 0 insertions, 16 deletions
diff --git a/inst b/inst
index 71378d2..8124b41 100644
--- a/inst
+++ b/inst
@@ -76,7 +76,6 @@ nextcloud_main() {
nextcloud_mark_initial_conig_done
detect_collabora
detect_onlyoffice
- ensure_office
joinscript_save_current_version
exit 0
}
@@ -453,21 +452,6 @@ detect_onlyoffice () {
fi
}
-ensure_office () {
- if [[ "$NC_OFFICE_SUITE" = "oo_community" ]] && [[ "$IS_UPDATE" = false ]] ; then
- echo -n "No office suite present – installing Community Document Server"
- nohup univention-app shell nextcloud sudo -u www-data /var/www/html/occ app:enable richdocumentscode &
- PID=$!
- while ps --pid ${PID} > /dev/null; do
- echo -n .
- sleep 3
- done
- echo
-
- univention-app shell nextcloud sudo -u www-data /var/www/html/occ app:enable richdocuments
- fi
-}
-
if [ "$JS_LAST_EXECUTED_VERSION" = 2 ]; then
ucr commit /etc/apache2/sites-available/000-default.conf /etc/apache2/sites-available/default-ssl.conf
joinscript_save_current_version