From 32183119179dc9a08e9bf40280cefb0daeceb112 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Sat, 6 Feb 2021 18:15:19 +0100 Subject: [PATCH 1/4] Update README.md --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 2b43238..cd32990 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,11 @@ CODE has a warning limitation **Upgrade this package:** You can use your YunoHost admin interface, or the command line: `sudo yunohost app upgrade --debug collabora -u https://github.com/YunoHost-Apps/collabora_ynh` +**Settings:** +The settings of Collabora are at https://office.domain.tld/loleaflet/dist/admin/admin.html. + +- User: admin +- Password: The password set during the installation. (If you forgot it, you can find it again in /etc/loolwsd/loolwsd.xml). ## Links From 98402f2de26637c77cd735cf0443067023eee963 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Sat, 6 Feb 2021 18:18:01 +0100 Subject: [PATCH 2/4] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cd32990..65978fb 100644 --- a/README.md +++ b/README.md @@ -40,13 +40,13 @@ CODE has a warning limitation ## Additionnal informations **Upgrade this package:** -You can use your YunoHost admin interface, or the command line: `sudo yunohost app upgrade --debug collabora -u https://github.com/YunoHost-Apps/collabora_ynh` +You can use your YunoHost admin interface, or the command line: `sudo yunohost app upgrade collabora -u https://github.com/YunoHost-Apps/collabora_ynh --debug` **Settings:** The settings of Collabora are at https://office.domain.tld/loleaflet/dist/admin/admin.html. - User: admin -- Password: The password set during the installation. (If you forgot it, you can find it again in /etc/loolwsd/loolwsd.xml). +- Password: The password set during the installation. (If you forgot it, you can find it again in `/etc/loolwsd/loolwsd.xml`). ## Links From 8639a28c0f5c222dea6005082f0ecf665877e7ce Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Sat, 6 Feb 2021 21:24:02 +0100 Subject: [PATCH 3/4] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 65978fb..3034c0b 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ CODE has a warning limitation You can use your YunoHost admin interface, or the command line: `sudo yunohost app upgrade collabora -u https://github.com/YunoHost-Apps/collabora_ynh --debug` **Settings:** -The settings of Collabora are at https://office.domain.tld/loleaflet/dist/admin/admin.html. +The settings of Collabora are at `https://office.domain.tld/loleaflet/dist/admin/admin.html`. - User: admin - Password: The password set during the installation. (If you forgot it, you can find it again in `/etc/loolwsd/loolwsd.xml`). From c74c1f7f0b5df00d5fb5233d20b94466e4b349f2 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Sun, 7 Feb 2021 16:49:01 +0100 Subject: [PATCH 4/4] Update README.md --- README.md | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 3034c0b..27b4cf4 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,16 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ![](https://www.collaboraoffice.com/wp-content/uploads/2019/07/Collabora_Online_-_versions_integration.png) ## Configuration +**Settings:** +The settings of Collabora are at `https://office.domain.tld/loleaflet/dist/admin/admin.html`. + +- User: admin +- Password: The password set during the installation. (If you forgot it, you can find it again in `/etc/loolwsd/loolwsd.xml`). + +## Connexion to Nextcloud +If you want to connect with Nextcloud, you have to install to install the [Collabora Online](https://apps.nextcloud.com/apps/richdocuments) app in Nextcloud, and configure it with the domain of your Collabora installation. + +*:warning: There are several Collabora Online apps. Be sure **not** to install the `Collabora Online - Built-in CODE server` apps, which are a lightwheigt version of this Collabora package. :warning:* ## Documentation @@ -32,8 +42,9 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Limitations -ARM platform not supported. -CODE has a warning limitation +**ARM platform not supported.** If you want to run Collabora on Nextcloud, there is a lightweight version of the Collabora server for ARM, called [Collabora Online - Built-in CODE Server (ARM64)](https://apps.nextcloud.com/apps/richdocumentscode_arm64) which can easily connect with the [Collabora Online](https://apps.nextcloud.com/apps/richdocuments) app. + +**CODE has a warning limitation** ![](https://www.libreoffice.org/assets/Uploads/LibreOffice-Online-limit.png) @@ -42,12 +53,6 @@ CODE has a warning limitation **Upgrade this package:** You can use your YunoHost admin interface, or the command line: `sudo yunohost app upgrade collabora -u https://github.com/YunoHost-Apps/collabora_ynh --debug` -**Settings:** -The settings of Collabora are at `https://office.domain.tld/loleaflet/dist/admin/admin.html`. - -- User: admin -- Password: The password set during the installation. (If you forgot it, you can find it again in `/etc/loolwsd/loolwsd.xml`). - ## Links * Report a bug: https://github.com/YunoHost-Apps/collabora_ynh/issues