From 3e9462656ebd60b0e5179b3ed342f9fcf9e67c10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 10 Jan 2024 16:56:53 +0100 Subject: [PATCH 1/4] Add .mjs as a file extension --- conf/nginx.conf | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 1750d6a..6375a8b 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,13 @@ -location ^~ /.well-known { +# Add .mjs as a file extension for javascript +# Either include it in the default mime.types list +# or include you can include that list explicitly and add the file extension +# only for Nextcloud like below: +include mime.types; +types { + text/javascript js mjs; +} + + location ^~ /.well-known { # The following 6 rules are borrowed from `.htaccess` # The following 2 rules are only needed for the user_webfinger app. From 874a0c516a58a19bbe6ec94598c08d90eb43af76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 10 Jan 2024 16:57:20 +0100 Subject: [PATCH 2/4] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 6375a8b..9ab915b 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -7,7 +7,7 @@ types { text/javascript js mjs; } - location ^~ /.well-known { +location ^~ /.well-known { # The following 6 rules are borrowed from `.htaccess` # The following 2 rules are only needed for the user_webfinger app. From 2f11e708b6027bce7951b06b042f32076533a4a0 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com> Date: Wed, 10 Jan 2024 18:49:37 +0100 Subject: [PATCH 3/4] Update ADMIN.md --- doc/ADMIN.md | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index 0f1d6a1..e9b7da8 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -1,19 +1,24 @@ -### How to use CLI commande +### Manually running Nextcloud commands -`sudo -u __APP__ php__YNH_PHP_VERSION__ --define apc.enable_cli=1 __INSTALL_DIR__/occ ...` +You can run Nextcloud commands from the command line using: -or use `sudo yunohost app shell __APP__` then run `php occ ...` +``` +sudo -u __APP__ php__YNH_PHP_VERSION__ --define apc.enable_cli=1 __INSTALL_DIR__/occ ... +``` -### Configure ONLYOFFICE integration +Alternatively, you may open a 'Nextcloud shell' with `sudo yunohost app shell __APP__`, then run `php occ ...` + +### ONLYOFFICE integration + +ONLYOFFICE is an online rich text document editor which can be integrated in Nextcloud #### With YunoHost App (ARM64 support, better performance) -For better performance and ARM64 support (Raspberry Pi, OLinuXino...), install ONLYOFFICE YunoHost App and connect it to Nextcloud, see the tutorial in the [doc of onlyoffice_ynh package](https://github.com/YunoHost-Apps/onlyoffice_ynh/blob/master/README_fr.md#configuration-de-onlyoffice-server) +For better performance and ARM64 support (Raspberry Pi, OLinuXino...), install the [OnlyOffice YunoHost app](https://apps.yunohost.org/app/onlyoffice) and connect it to Nextcloud, see the tutorial in the [doc of onlyoffice_ynh package](https://github.com/YunoHost-Apps/onlyoffice_ynh/blob/master/README_fr.md#configuration-de-onlyoffice-server) #### Alternative: With Nextcloud App (no ARM support, lower performance) -Nextcloud features a direct integration of ONLYOFFICE (an online rich text document editor) through a Nextcloud app. -To install and configure it: +Nextcloud features a direct integration of ONLYOFFICE through a Nextcloud app. - Install *Community Document Server* application in your Nextcloud. That's the part that runs ONLYOFFICE server. - Install *ONLYOFFICE* application. That's the client part that will connect to an ONLYOFFICE server. - Then in Settings -> ONLYOFFICE (`https://__DOMAIN____PATH__/settings/admin/onlyoffice`), if you want to configure which file formats should be opened by ONLYOFFICE. From b4f66f67c5a634696a0020e241b88edcf4d80a88 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com> Date: Wed, 10 Jan 2024 18:54:31 +0100 Subject: [PATCH 4/4] Update ADMIN_fr.md --- doc/ADMIN_fr.md | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index 3a691ba..85445bd 100644 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -1,21 +1,24 @@ -### Comment utiliser la commande CLI +### Exécuter manuellement des commandes Nextcloud -`sudo -u __APP__ php__YNH_PHP_VERSION__ --define apc.enable_cli=1 __INSTALL_DIR__/occ ...` +Vous pouvez lancer des commandes Nextcloud depuis la ligne de commande avec: -ou utilisez `sudo yunohost app shell __APP__` puis `php occ ...` +``` +sudo -u __APP__ php__YNH_PHP_VERSION__ --define apc.enable_cli=1 __INSTALL_DIR__/occ ... +``` -### Configurer l'intégration d'ONLYOFFICE +Ou bien, vous pouvez ouvrir un "shell Nextcloud" avec `sudo yunohost app shell __APP__`, puis lancer `php occ ...` + +### Intégration d'ONLYOFFICE + +ONLYOFFICE est un éditeur de texte enrichi en ligne qui peut s'intégrer dans Nextcloud #### Avec l'application YunoHost (support ARM64, meilleures performances) -Pour de meilleures performances et le support de ARM64 (Raspberry Pi, OLinuXino...), installez l'app YunoHost ONLYOFFICE, voir le tutoriel dans la [doc du paquet onlyoffice_ynh](https://github.com/YunoHost-Apps/onlyoffice_ynh/blob/master/README_fr.md#configuration-de-onlyoffice-server) +Pour de meilleures performances et le support de ARM64 (Raspberry Pi, OLinuXino...), installez l'[app YunoHost OnlyOffice](https://apps.yunohost.org/app/onlyoffice), puis connectez-la à Nextcloud : voir le tutoriel dans la [doc du paquet onlyoffice_ynh](https://github.com/YunoHost-Apps/onlyoffice_ynh/blob/master/README_fr.md#configuration-de-onlyoffice-server) -#### Alternative: Avec l'application Nextcloud (pas de support ARM, performances limitées) +#### Alternative: avec l'application Nextcloud (pas de support ARM, performances limitées) -Nextcloud inclut une intégration directe de ONLYOFFICE (un éditeur de texte enrichi en ligne) via une application Nextcloud. -Pour l'installer et la configurer : +Nextcloud inclut une intégration directe via une application Nextcloud. - Installez l'application *Community Document Server* dans votre Nextcloud. C'est la partie qui fait tourner un serveur ONLYOFFICE. - Installez l'application *ONLYOFFICE*. C'est la partie cliente qui va se connecter au serveur ONLYOFFICE. - Ensuite dans les Paramètres -> ONLYOFFICE (`https://__DOMAIN____PATH__/settings/admin/onlyoffice`), si vous voulez configurer quels formats de fichier s'ouvrent avec ONLYOFFICE. - -*NB : l'app Nextcloud ONLYOFFICE Community Document Server n'est disponible que sous architecture x86