From 3bc7bf70cc107853958b13bf93ce92be2dfb8cc1 Mon Sep 17 00:00:00 2001 From: Nicolas Frandeboeuf Date: Wed, 5 Jul 2023 11:58:44 +0200 Subject: [PATCH 01/19] [doc] Specify how to retrieve the secret key for Nextcloud --- doc/DISCLAIMER.md | 4 +++- doc/DISCLAIMER_fr.md | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 7511944..43b3a11 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -34,7 +34,9 @@ You should not install ONLYOFFICE on your main YunoHost domain, especially if yo Prerequisite: **ONLYOFFICE should be public**, see previous section. * In Nextcloud apps store, install `ONLYOFFICE`, i.e. the [ONLYOFFICE connector for Nextcloud](https://apps.nextcloud.com/apps/onlyoffice). * Go in the Nextcloud `settings` > `Administration` > `ONLYOFFICE` > `Server settings` > `Address of the Document Server`. -* Give the installation domain of your `onlyoffice`, e.g. `https://office.yunohost.domain/` and click `Save`. +* Give the installation domain of your `onlyoffice`, e.g. `https://office.yunohost.domain/`. +* Give the secret key that was sent to you by email during the install (you can also retrieve it with the CLI command `sudo documentserver-jwt-status.sh`). +* Click `Save`. * Create a new document and enjoy! ### Desktop Edition on PC diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md index af2a969..e828325 100644 --- a/doc/DISCLAIMER_fr.md +++ b/doc/DISCLAIMER_fr.md @@ -34,7 +34,9 @@ Vous ne devez pas installer ONLYOFFICE sur votre domaine YunoHost principal, sur Prérequis : **ONLYOFFICE doit être public**, voir la section précédente. * dans le magasin d'applications Nextcloud, installez `ONLYOFFICE`, c'est-à-dire le [connecteur ONLYOFFICE pour Nextcloud](https://apps.nextcloud.com/apps/onlyoffice) * Allez dans Nextcloud `Paramètres` > `Administration` > `ONLYOFFICE` > `Paramètres du serveur` > `Adresse du service d'édition de document`. -* Spécifiez le domaine d'installation de votre serveur `ONLYOFFICE`, par exemple `https://office.yunohost.domain/` et cliquez sur `Enregistrer`. +* Spécifiez le domaine d'installation de votre serveur `ONLYOFFICE`, par exemple `https://office.yunohost.domain/`. +* Renseignez la clé secrète qui vous a été envoyée par email lors de l'installation (vous pouvez aussi la retrouve avec la ligne de commande `sudo documentserver-jwt-status.sh`). +* Cliquez sur `Enregistrer`. * Créez un nouveau document ! ### Desktop Édition sur PC From 37e5b1b5f57aa26be655f29e514e63f8a47d8deb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 2 Oct 2023 11:59:19 +0200 Subject: [PATCH 02/19] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 4cf4f5a..21af68a 100644 --- a/manifest.json +++ b/manifest.json @@ -20,7 +20,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 11.0.9" + "yunohost": ">= 11.2" }, "multi_instance": false, "services": [ From 6134a66ad3fc854f0f7050c77f26965d544858e2 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 2 Oct 2023 09:59:25 +0000 Subject: [PATCH 03/19] Auto-update README --- README.md | 1 - README_fr.md | 1 - 2 files changed, 2 deletions(-) diff --git a/README.md b/README.md index 93d1805..6296a41 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,6 @@ Prerequisite: **ONLYOFFICE should be public**, see previous section. * Official app website: * Upstream app code repository: -* YunoHost documentation for this app: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 1aafadb..a7d7a28 100644 --- a/README_fr.md +++ b/README_fr.md @@ -92,7 +92,6 @@ Prérequis : **ONLYOFFICE doit être public**, voir la section précédente. * Site officiel de l’app : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : * Signaler un bug : ## Informations pour les développeurs From eb593656089a7378685087e31cf2c9bc5e0797f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 21 Oct 2023 14:43:18 +0200 Subject: [PATCH 04/19] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 21af68a..5737160 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Create and edit documents collaboratively", "fr": "Créez et éditer des documents collaborativement" }, - "version": "7.3.3~ynh1", + "version": "7.5~ynh1", "url": "https://www.onlyoffice.com", "upstream": { "license": "GPL-3.0-or-later", From 61792fb418b5b8b7b5d347f67b2b35968051d5c9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 21 Oct 2023 12:43:22 +0000 Subject: [PATCH 05/19] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6296a41..5413c8b 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Online collaborative edition of ONLYOFFICE documents requires: A solution made easy by YunoHost is to install (1.i) and (2.i), see [section below](https://github.com/YunoHost-Apps/onlyoffice_ynh/#configuration-of-onlyoffice-server). The Nextcloud addicts may follow [this tutorial](https://github.com/YunoHost-Apps/nextcloud_ynh#configure-onlyoffice-integration) to install (1.ii) and (2.i) on one Nextcloud instance. However, performance and architecture are limited. -**Shipped version:** 7.3.3~ynh1 +**Shipped version:** 7.5~ynh1 **Demo:** https://www.onlyoffice.com/fr/download-desktop.aspx diff --git a/README_fr.md b/README_fr.md index a7d7a28..93c0ad4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ L'édition collaborative en ligne des documents ONLYOFFICE nécessite : Une solution rendue facile par YunoHost est d'installer (1.i) et (2.i), voir [ci-dessous](https://github.com/YunoHost-Apps/onlyoffice_ynh/blob/master/README_fr.md#configuration-de-onlyoffice-server). Les utilisateurs qui aiment le tout Nextcloud peuvent suivre [ce tutoriel](https://github.com/YunoHost-Apps/nextcloud_ynh/blob/master/README_fr.md#configurer-lint%C3%A9gration-donlyoffice) pour installer le Community Document Server (1.ii) et ONLYOFFICE connector (2.i) sur une instance Nextcloud. Cependant, les performances et l'architecture sont limitées. -**Version incluse :** 7.3.3~ynh1 +**Version incluse :** 7.5~ynh1 **Démo :** https://www.onlyoffice.com/fr/download-desktop.aspx From b89e237ca8d86467045e276e3d803f577d2ec276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 21 Oct 2023 14:44:54 +0200 Subject: [PATCH 06/19] Update install --- scripts/install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index a5668d9..3d7c7f8 100644 --- a/scripts/install +++ b/scripts/install @@ -120,7 +120,9 @@ echo onlyoffice-documentserver onlyoffice/db-user string $db_user | debconf-set- echo onlyoffice-documentserver onlyoffice/db-pwd password $db_pwd | debconf-set-selections echo onlyoffice-documentserver onlyoffice/db-name string $db_name | debconf-set-selections -#echo onlyoffice-documentserver onlyoffice/jwt-enabled boolean false | debconf-set-selections +#JWT options +echo onlyoffice-documentserver onlyoffice/jwt-enabled boolean true | debconf-set-selections +echo onlyoffice-documentserver onlyoffice/jwt-secret password $jwt_secret | debconf-set-selections #================================================= # INSTALL ONLYOFFICE @@ -183,8 +185,6 @@ ynh_systemd_action --service_name=nginx --action=reload #================================================= ynh_script_progression --message="Sending a readme for the admin..." -jwt_token=$(documentserver-jwt-status.sh | sed "3q;d" | cut -d "-" -f 2 | tr -d ' ') - ynh_send_readme_to_admin --app_message="../conf/msg_install" --recipients=$admin_mail --type='install' #================================================= From 588074b48f796cf6bdb7c27ec4f8523a6a7452e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 21 Oct 2023 14:45:46 +0200 Subject: [PATCH 07/19] Update install --- scripts/install | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/install b/scripts/install index 3d7c7f8..aad7579 100644 --- a/scripts/install +++ b/scripts/install @@ -28,6 +28,7 @@ nextclouddomain=$YNH_APP_ARG_NEXTCLOUDDOMAIN app=$YNH_APP_INSTANCE_NAME admin=$YNH_APP_ARG_ADMIN admin_mail=$(ynh_user_get_info --username=$admin --key="mail") +jwt_secret=$(ynh_string_random --length=32) #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS @@ -54,6 +55,7 @@ ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=nextclouddomain --value=$nextclouddomain ynh_app_setting_set --app=$app --key=final_path --value=$final_path +ynh_app_setting_set --app=$app --key=jwt_secret --value=$jwt_secret #================================================= # STANDARD MODIFICATIONS From 5691ea9d13819b87fe751b1273857f77a9ee93ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 21 Oct 2023 14:55:48 +0200 Subject: [PATCH 08/19] Update msg_install --- conf/msg_install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/msg_install b/conf/msg_install index 917dc24..b53fc33 100644 --- a/conf/msg_install +++ b/conf/msg_install @@ -5,7 +5,7 @@ Please open your __APP__ domain: https://__DOMAIN____PATH_URL__ To configure OnlyOffice with your Nextcloud, go to the settings: under "Administration > ONLYOFFICE > Server settings > - Address of the Document Server" enter: "https://__DOMAIN____PATH_URL__" -- Secret key" enter "__JWT_TOKEN__" +- Secret key" enter "__JWT_SECRET__" OnlyOffice should now work with your Nextcloud! From e0de724d418abb1eb87dc71a3860f306000989f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 21 Oct 2023 15:50:26 +0200 Subject: [PATCH 09/19] Update restore --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index dbad15d..af41ab7 100644 --- a/scripts/restore +++ b/scripts/restore @@ -113,7 +113,7 @@ ynh_restore_file --origin_path="/var/lib/onlyoffice/documentserver/App_Data/cach #================================================= ynh_script_progression --message="Generating fonts..." -/usr/bin/documentserver-generate-allfonts.sh +/usr/bin/documentserver-generate-allfonts.sh 2>/dev/null #================================================= # SECURE FILES AND DIRECTORIES From 68138f318de04fa9809e818645347ecab66a69c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 21 Oct 2023 16:07:36 +0200 Subject: [PATCH 10/19] Update msg_install --- conf/msg_install | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/msg_install b/conf/msg_install index b53fc33..227ea45 100644 --- a/conf/msg_install +++ b/conf/msg_install @@ -3,7 +3,8 @@ __APP__ was successfully installed :) Please open your __APP__ domain: https://__DOMAIN____PATH_URL__ To configure OnlyOffice with your Nextcloud, go to the settings: -under "Administration > ONLYOFFICE > Server settings > +- In Nextcloud, download ONLYOFFICE app +- under "Administration > ONLYOFFICE > Server settings > - Address of the Document Server" enter: "https://__DOMAIN____PATH_URL__" - Secret key" enter "__JWT_SECRET__" From 3bd9d79d265281503c0ca3ac7290eeea9088e17e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 21 Oct 2023 16:11:06 +0200 Subject: [PATCH 11/19] Update check_process --- check_process | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/check_process b/check_process index 46b5da7..e9dccdb 100644 --- a/check_process +++ b/check_process @@ -12,7 +12,8 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=2be500cb4251cc1209ae36c7f0668aa17be230aa + #7.3.3~ynh1 + upgrade=1 from_commit=205cc12c26b46c57ba8459f449e835949be44096 backup_restore=1 multi_instance=0 port_already_use=0 @@ -21,6 +22,6 @@ Email= Notification=none ;;; Upgrade options - ; commit=2be500cb4251cc1209ae36c7f0668aa17be230aa - name=Merge pull request #72 from YunoHost-Apps/testing + ; commit=205cc12c26b46c57ba8459f449e835949be44096 + name=7.3.3~ynh1 manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& \ No newline at end of file From c668615f6237bdf201b42aff9d25b677058132b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 21 Oct 2023 16:12:45 +0200 Subject: [PATCH 12/19] Update upgrade --- scripts/upgrade | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 2aca68e..5499460 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -24,11 +24,11 @@ db_user=$db_name db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) port=$(ynh_app_setting_get --app=$app --key=port) nextclouddomain=$(ynh_app_setting_get --app=$app --key=nextclouddomain) +jwt_secret=$(ynh_app_setting_get --app=$app --key=jwt_secret) #================================================= # CHECK VERSION #================================================= -ynh_script_progression --message="Checking version..." upgrade_type=$(ynh_check_app_version_changed) @@ -125,6 +125,10 @@ echo onlyoffice-documentserver onlyoffice/db-user string $db_user | debconf-set- echo onlyoffice-documentserver onlyoffice/db-pwd password $db_pwd | debconf-set-selections echo onlyoffice-documentserver onlyoffice/db-name string $db_name | debconf-set-selections +#JWT options +echo onlyoffice-documentserver onlyoffice/jwt-enabled boolean true | debconf-set-selections +echo onlyoffice-documentserver onlyoffice/jwt-secret password $jwt_secret | debconf-set-selections + #================================================= # UPGRADE ONLYOFFICE #================================================= @@ -156,7 +160,7 @@ ynh_store_file_checksum --file="/etc/onlyoffice/documentserver/default.json" #================================================= ynh_script_progression --message="Generating fonts..." -/usr/bin/documentserver-generate-allfonts.sh +/usr/bin/documentserver-generate-allfonts.sh 2>/dev/null #================================================= # SECURE FILES AND DIRECTORIES From 7360ce0b7d723d5fa44e1a9ebe3d9ba00ec31a32 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 21 Oct 2023 14:27:07 +0000 Subject: [PATCH 13/19] Auto-update README --- README.md | 4 +++- README_fr.md | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5413c8b..af72af8 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,9 @@ You should not install ONLYOFFICE on your main YunoHost domain, especially if yo Prerequisite: **ONLYOFFICE should be public**, see previous section. * In Nextcloud apps store, install `ONLYOFFICE`, i.e. the [ONLYOFFICE connector for Nextcloud](https://apps.nextcloud.com/apps/onlyoffice). * Go in the Nextcloud `settings` > `Administration` > `ONLYOFFICE` > `Server settings` > `Address of the Document Server`. -* Give the installation domain of your `onlyoffice`, e.g. `https://office.yunohost.domain/` and click `Save`. +* Give the installation domain of your `onlyoffice`, e.g. `https://office.yunohost.domain/`. +* Give the secret key that was sent to you by email during the install (you can also retrieve it with the CLI command `sudo documentserver-jwt-status.sh`). +* Click `Save`. * Create a new document and enjoy! ### Desktop Edition on PC diff --git a/README_fr.md b/README_fr.md index 93c0ad4..6ead2a9 100644 --- a/README_fr.md +++ b/README_fr.md @@ -76,7 +76,9 @@ Vous ne devez pas installer ONLYOFFICE sur votre domaine YunoHost principal, sur Prérequis : **ONLYOFFICE doit être public**, voir la section précédente. * dans le magasin d'applications Nextcloud, installez `ONLYOFFICE`, c'est-à-dire le [connecteur ONLYOFFICE pour Nextcloud](https://apps.nextcloud.com/apps/onlyoffice) * Allez dans Nextcloud `Paramètres` > `Administration` > `ONLYOFFICE` > `Paramètres du serveur` > `Adresse du service d'édition de document`. -* Spécifiez le domaine d'installation de votre serveur `ONLYOFFICE`, par exemple `https://office.yunohost.domain/` et cliquez sur `Enregistrer`. +* Spécifiez le domaine d'installation de votre serveur `ONLYOFFICE`, par exemple `https://office.yunohost.domain/`. +* Renseignez la clé secrète qui vous a été envoyée par email lors de l'installation (vous pouvez aussi la retrouve avec la ligne de commande `sudo documentserver-jwt-status.sh`). +* Cliquez sur `Enregistrer`. * Créez un nouveau document ! ### Desktop Édition sur PC From bf6c6726ee151f0dce0649b780ff919193efc75c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 21 Oct 2023 16:33:18 +0200 Subject: [PATCH 14/19] Update msg_install --- conf/msg_install | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/conf/msg_install b/conf/msg_install index 227ea45..9ab085e 100644 --- a/conf/msg_install +++ b/conf/msg_install @@ -1,12 +1,10 @@ __APP__ was successfully installed :) -Please open your __APP__ domain: https://__DOMAIN____PATH_URL__ - -To configure OnlyOffice with your Nextcloud, go to the settings: -- In Nextcloud, download ONLYOFFICE app -- under "Administration > ONLYOFFICE > Server settings > -- Address of the Document Server" enter: "https://__DOMAIN____PATH_URL__" -- Secret key" enter "__JWT_SECRET__" +To configure OnlyOffice with Nextcloud: +- Within Nextcloud, install ONLYOFFICE app +- go to the settings under "Administration > ONLYOFFICE > Server settings +- Address of the Document Server: "https://__DOMAIN____PATH_URL__" +- Secret key: "__JWT_SECRET__" OnlyOffice should now work with your Nextcloud! From 3b461aea4c55cd29448e38fd7f640f86ab92a7f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 21 Oct 2023 16:34:53 +0200 Subject: [PATCH 15/19] Update upgrade --- scripts/upgrade | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 5499460..ef45eca 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -142,7 +142,6 @@ ynh_remove_extra_repo --name="$app" # backward compat # ynh_remove_app_dependencies ynh_install_extra_app_dependencies --repo="https://download.onlyoffice.com/repo/debian squeeze main" --package="onlyoffice-documentserver" --key="https://download.onlyoffice.com/GPG-KEY-ONLYOFFICE" - #================================================= # UPDATE A CONFIG FILE #================================================= From c4f6c0f9a48853a1d0ae7c612f8ccde04e469af9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 21 Oct 2023 16:36:54 +0200 Subject: [PATCH 16/19] fix --- scripts/install | 1 - scripts/restore | 5 +++++ scripts/upgrade | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index aad7579..c5b85af 100644 --- a/scripts/install +++ b/scripts/install @@ -123,7 +123,6 @@ echo onlyoffice-documentserver onlyoffice/db-pwd password $db_pwd | debconf-set- echo onlyoffice-documentserver onlyoffice/db-name string $db_name | debconf-set-selections #JWT options -echo onlyoffice-documentserver onlyoffice/jwt-enabled boolean true | debconf-set-selections echo onlyoffice-documentserver onlyoffice/jwt-secret password $jwt_secret | debconf-set-selections #================================================= diff --git a/scripts/restore b/scripts/restore index af41ab7..c2e0b9f 100644 --- a/scripts/restore +++ b/scripts/restore @@ -32,6 +32,7 @@ db_user=$db_name db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) port=$(ynh_app_setting_get --app=$app --key=port) nextclouddomain=$(ynh_app_setting_get --app=$app --key=nextclouddomain) +jwt_secret=$(ynh_app_setting_get --app=$app --key=jwt_secret) #================================================= # CHECK IF THE APP CAN BE RESTORED @@ -89,6 +90,9 @@ echo onlyoffice-documentserver onlyoffice/db-user string $db_user | debconf-set- echo onlyoffice-documentserver onlyoffice/db-pwd password $db_pwd | debconf-set-selections echo onlyoffice-documentserver onlyoffice/db-name string $db_name | debconf-set-selections +#JWT options +echo onlyoffice-documentserver onlyoffice/jwt-secret password $jwt_secret | debconf-set-selections + #================================================= # REINSTALL ONLYOFFICE #================================================= @@ -106,6 +110,7 @@ ynh_restore_file --origin_path="/etc/onlyoffice" #================================================= # RESTORE THE CACHE #================================================= + ynh_restore_file --origin_path="/var/lib/onlyoffice/documentserver/App_Data/cache/files" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index ef45eca..4dc37c7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -126,7 +126,6 @@ echo onlyoffice-documentserver onlyoffice/db-pwd password $db_pwd | debconf-set- echo onlyoffice-documentserver onlyoffice/db-name string $db_name | debconf-set-selections #JWT options -echo onlyoffice-documentserver onlyoffice/jwt-enabled boolean true | debconf-set-selections echo onlyoffice-documentserver onlyoffice/jwt-secret password $jwt_secret | debconf-set-selections #================================================= From 42317b12a218a1bf6f50002eb6336d31372ca50f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 21 Oct 2023 16:37:58 +0200 Subject: [PATCH 17/19] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 4dc37c7..f5fc225 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -126,7 +126,7 @@ echo onlyoffice-documentserver onlyoffice/db-pwd password $db_pwd | debconf-set- echo onlyoffice-documentserver onlyoffice/db-name string $db_name | debconf-set-selections #JWT options -echo onlyoffice-documentserver onlyoffice/jwt-secret password $jwt_secret | debconf-set-selections +#echo onlyoffice-documentserver onlyoffice/jwt-secret password $jwt_secret | debconf-set-selections #================================================= # UPGRADE ONLYOFFICE From b252888639ac5b8991b8efbd364bd5d737a8dd1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 21 Oct 2023 21:24:33 +0200 Subject: [PATCH 18/19] Update restore --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index c2e0b9f..5fc480a 100644 --- a/scripts/restore +++ b/scripts/restore @@ -98,7 +98,7 @@ echo onlyoffice-documentserver onlyoffice/jwt-secret password $jwt_secret | debc #================================================= ynh_script_progression --message="Reinstalling OnlyOffice..." -ynh_install_extra_app_dependencies --repo="https://download.onlyoffice.com/repo/debian squeeze main" --package="onlyoffice-documentserver" --key="https://download.onlyoffice.com/GPG-KEY-ONLYOFFICE" +ynh_exec_warn_less ynh_install_extra_app_dependencies --repo="https://download.onlyoffice.com/repo/debian squeeze main" --package="onlyoffice-documentserver" --key="https://download.onlyoffice.com/GPG-KEY-ONLYOFFICE" #================================================= # RESTORE THE CONFIGURATION From 97a54eb6d3b5f8e6acfee55bd1fdd50da288baf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 21 Oct 2023 21:25:23 +0200 Subject: [PATCH 19/19] cleaning --- scripts/restore | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index 5fc480a..dfbf236 100644 --- a/scripts/restore +++ b/scripts/restore @@ -91,7 +91,7 @@ echo onlyoffice-documentserver onlyoffice/db-pwd password $db_pwd | debconf-set- echo onlyoffice-documentserver onlyoffice/db-name string $db_name | debconf-set-selections #JWT options -echo onlyoffice-documentserver onlyoffice/jwt-secret password $jwt_secret | debconf-set-selections +#echo onlyoffice-documentserver onlyoffice/jwt-secret password $jwt_secret | debconf-set-selections #================================================= # REINSTALL ONLYOFFICE diff --git a/scripts/upgrade b/scripts/upgrade index f5fc225..3ffa469 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -24,7 +24,7 @@ db_user=$db_name db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) port=$(ynh_app_setting_get --app=$app --key=port) nextclouddomain=$(ynh_app_setting_get --app=$app --key=nextclouddomain) -jwt_secret=$(ynh_app_setting_get --app=$app --key=jwt_secret) +#jwt_secret=$(ynh_app_setting_get --app=$app --key=jwt_secret) #================================================= # CHECK VERSION