From 282cfef3b1ee3db99f6f9740a0a9a0f3b52c36ae Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 16 Mar 2023 06:08:21 +0000 Subject: [PATCH 1/6] Upgrade to v7.3.3 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index a6feca0..b60987d 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.2.2~ynh1", + "version": "7.3.3~ynh1", "url": "https://www.onlyoffice.com", "upstream": { "license": "GPL-3.0-or-later", From ea11a05b893c17832d530f5521f3041f8cc59acf Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 16 Mar 2023 06:08:27 +0000 Subject: [PATCH 2/6] Auto-update README --- README.md | 5 +++-- README_fr.md | 23 ++++++++++++----------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 79a9712..3f3e0c2 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,8 @@ It shall NOT be edited by hand. # OnlyOffice for YunoHost -[![Integration level](https://dash.yunohost.org/integration/onlyoffice.svg)](https://dash.yunohost.org/appci/app/onlyoffice) ![Working status](https://ci-apps.yunohost.org/ci/badges/onlyoffice.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/onlyoffice.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/onlyoffice.svg)](https://dash.yunohost.org/appci/app/onlyoffice) ![Working status](https://ci-apps.yunohost.org/ci/badges/onlyoffice.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/onlyoffice.maintain.svg) + [![Install OnlyOffice with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=onlyoffice) *[Lire ce readme en français.](./README_fr.md)* @@ -29,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.2.2~ynh1 +**Shipped version:** 7.3.3~ynh1 **Demo:** https://www.onlyoffice.com/fr/download-desktop.aspx diff --git a/README_fr.md b/README_fr.md index ef6bb52..4b6ea6b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,15 +5,16 @@ It shall NOT be edited by hand. # OnlyOffice pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/onlyoffice.svg)](https://dash.yunohost.org/appci/app/onlyoffice) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/onlyoffice.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/onlyoffice.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/onlyoffice.svg)](https://dash.yunohost.org/appci/app/onlyoffice) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/onlyoffice.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/onlyoffice.maintain.svg) + [![Installer OnlyOffice avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=onlyoffice) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer OnlyOffice rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* +> *Ce package vous permet d’installer OnlyOffice rapidement et simplement sur un serveur YunoHost. +Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* -## Vue d'ensemble +## Vue d’ensemble ONLYOFFICE Document Server est une suite bureautique en ligne comprenant des visualiseurs et des éditeurs de textes, feuilles de calcul et présentations, entièrement compatible avec les formats Office Open XML: .docx, .xlsx, .pptx et permettant l'édition collaborative en temps réel. @@ -29,14 +30,14 @@ 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.2.2~ynh1 +**Version incluse :** 7.3.3~ynh1 **Démo :** https://www.onlyoffice.com/fr/download-desktop.aspx -## Captures d'écran +## Captures d’écran -![Capture d'écran de OnlyOffice](./doc/screenshots/.DS_Store) -![Capture d'écran de OnlyOffice](./doc/screenshots/document-short.png) +![Capture d’écran de OnlyOffice](./doc/screenshots/.DS_Store) +![Capture d’écran de OnlyOffice](./doc/screenshots/document-short.png) ## Avertissements / informations importantes @@ -90,8 +91,8 @@ Prérequis : **ONLYOFFICE doit être public**, voir la section précédente. ## Documentations et ressources -* Site officiel de l'app : -* Dépôt de code officiel de l'app : +* Site officiel de l’app : +* Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : @@ -107,4 +108,4 @@ ou sudo yunohost app upgrade onlyoffice -u https://github.com/YunoHost-Apps/onlyoffice_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From 68114dc6ca4a328a293ff22d7ff22a469f80a09b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Mennetrier?= Date: Sat, 22 Apr 2023 14:59:29 +0200 Subject: [PATCH 3/6] Fix install of version 7.3.3 --- scripts/install | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/install b/scripts/install index 9d3a30c..f00a347 100644 --- a/scripts/install +++ b/scripts/install @@ -70,7 +70,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port ynh_script_progression --message="Installing dependencies..." ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies -ynh_exec_warn_less ynh_install_extra_app_dependencies --repo="deb http://deb.debian.org/debian/ buster main contrib" --package=$contrib_dependencies --key="https://ftp-master.debian.org/keys/release-$(lsb_release --release --short).asc" +ynh_exec_warn_less ynh_install_extra_app_dependencies --repo="deb http://deb.debian.org/debian/ $(lsb_release --codename --short) main contrib" --package=$contrib_dependencies --key="https://ftp-master.debian.org/keys/release-$(lsb_release --release --short).asc" #================================================= # CREATE DEDICATED USER @@ -130,7 +130,7 @@ apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CB2DE8E5 2>/de # restart nginx and the whole webadmin and maybe even the yunohost command # running the install ... -ynh_install_extra_app_dependencies --repo="https://download.onlyoffice.com/repo/debian squeeze main" --package=$extra_dependencies --key="https://ftp-master.debian.org/keys/release-$(lsb_release --release --short).asc" +ynh_install_extra_app_dependencies --repo="https://download.onlyoffice.com/repo/debian squeeze main" --package=$extra_dependencies --key="https://download.onlyoffice.com/GPG-KEY-ONLYOFFICE" #================================================= # ADD A CONFIGURATION @@ -154,11 +154,11 @@ chown -R ds:ds "$final_path" #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." +# ynh_script_progression --message="Starting a systemd service..." -supervisorctl reload +# supervisorctl reload -sleep 30 +# sleep 30 #================================================= # REGENERATE FONTS From 81c2a96e2bddd155e5f3f992f3fca573a23ee5ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Mennetrier?= Date: Sat, 22 Apr 2023 21:43:07 +0200 Subject: [PATCH 4/6] Fix restore and upgrade --- doc/screenshots/.DS_Store | Bin 6148 -> 0 bytes scripts/restore | 6 +++--- scripts/upgrade | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 doc/screenshots/.DS_Store diff --git a/doc/screenshots/.DS_Store b/doc/screenshots/.DS_Store deleted file mode 100644 index 2864207ee310948797cde5fab54e0003a660da27..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKF-`+P3>-s>NHh@@<$eGVKUhVfpymT834$VU2#9E}@7&JX zUfmSuGXPuew->+yz?|-gcVEWl=k6mrXp9l*tnq+bJmM9nco{`c6P|mFEjnzlALQSY zduFXOJhA58)vnvDcio!tyvWXpZy#aPg~dt%DIf);fE17dlL~n6rOl5LwMqdgAO*e^ z@b5#RJJyDMVthKd#0Wr~kq+Z?%o4=n1hF>k6UoplQ;C^sZN#ulCtq4zZP+JfIxKEx zop!Ue3B}@e@+HDyHBqY+kOD&m4s*Nk{(njTW&R%~X(t7wz`s(!W~=MflCRWy>*(dY w*B1H>{mU2|;as8>6QdP# Date: Sun, 23 Apr 2023 00:29:53 +0200 Subject: [PATCH 5/6] Do not use keyserver ubuntu that return error 500 regularly --- scripts/install | 3 ++- scripts/restore | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index f00a347..d190353 100644 --- a/scripts/install +++ b/scripts/install @@ -123,7 +123,8 @@ echo onlyoffice-documentserver onlyoffice/db-name string $db_name | debconf-set- #================================================= ynh_script_progression --message="Install OnlyOffice..." -apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CB2DE8E5 2>/dev/null +# keyserver.ubuntu.com response an error 500 regularly +#apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CB2DE8E5 2>/dev/null # The onlyoffice dev had the magnificent idea to add a "nginx restart" during # the install/configure of their package, which is awful since that will diff --git a/scripts/restore b/scripts/restore index 7258d0e..f4ad5e3 100644 --- a/scripts/restore +++ b/scripts/restore @@ -94,9 +94,10 @@ echo onlyoffice-documentserver onlyoffice/db-name string $db_name | debconf-set- #================================================= ynh_script_progression --message="Reinstalling OnlyOffice..." -apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CB2DE8E5 +# apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CB2DE8E5 -ynh_install_extra_app_dependencies --repo="https://download.onlyoffice.com/repo/debian squeeze main" --package=$extra_dependencies --key="https://ftp-master.debian.org/keys/release-$(lsb_release --release --short).asc" +# ynh_install_extra_app_dependencies --repo="https://download.onlyoffice.com/repo/debian squeeze main" --package=$extra_dependencies --key="https://ftp-master.debian.org/keys/release-$(lsb_release --release --short).asc" +ynh_install_extra_app_dependencies --repo="https://download.onlyoffice.com/repo/debian squeeze main" --package=$extra_dependencies --key="https://download.onlyoffice.com/GPG-KEY-ONLYOFFICE" #================================================= # RESTORE THE CONFIGURATION From 829c486983bb7d26de0c813ce772898c7b744682 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Mennetrier?= Date: Sun, 23 Apr 2023 21:22:28 +0200 Subject: [PATCH 6/6] Fix install during upgrade --- scripts/upgrade | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 4922427..8f93d8b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -131,10 +131,13 @@ echo onlyoffice-documentserver onlyoffice/db-name string $db_name | debconf-set- ynh_script_progression --message="Upgrading OnlyOffice..." ynh_remove_extra_repo --name="$app" # backward compat -apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CB2DE8E5 + +# keyserver.ubuntu.com response an error 500 regularly +# apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CB2DE8E5 # ynh_remove_app_dependencies -ynh_install_extra_app_dependencies --repo="https://download.onlyoffice.com/repo/debian squeeze main" --package=$extra_dependencies --key="https://ftp-master.debian.org/keys/release-$(lsb_release --release --short).asc" +ynh_install_extra_app_dependencies --repo="https://download.onlyoffice.com/repo/debian squeeze main" --package=$extra_dependencies --key="https://download.onlyoffice.com/GPG-KEY-ONLYOFFICE" + #================================================= # UPDATE A CONFIG FILE