From 6ceb2ce1fde45b5ad80e844c13bc4de69a1d637c Mon Sep 17 00:00:00 2001 From: Nicolas Frandeboeuf Date: Wed, 17 Apr 2024 13:55:50 +0200 Subject: [PATCH 1/5] Replace "public" boolean with "visitors" in ADMIN.md --- doc/ADMIN.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index e6e1a92..7942b2c 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -26,7 +26,7 @@ You should not install ONLYOFFICE on your main YunoHost domain, especially if yo * Choose a domain name for ONLYOFFICE that is different from your Nextcloud domain, e.g. `office.yunohost.domain` (or `office.domain.nohost.me`, see previous section). * Choose a path for ONLYOFFICE, e.g. `/` if you install on `office.yunohost.domain` (do not install any other app on this domain). * The domain of your Nextcloud instance, e.g. `yunohost.domain/nextcloud` or `nextcloud.yunohost.domain`. - * Is it a public application? **If you want to connect it to Nextcloud, ONLYOFFICE should be public**: then select `Yes` or `tick the box`. + * Is it a public application? **If you want to connect it to Nextcloud, ONLYOFFICE should be public**: then select `visitors``. ## How to edit ONLYOFFICE documents? From ad7045d7148976e4509378cf84a2189123e53f30 Mon Sep 17 00:00:00 2001 From: Kayou Date: Wed, 17 Apr 2024 23:36:07 +0200 Subject: [PATCH 2/5] install ttf-mscorefonts-installer with pat resources --- manifest.toml | 9 ++------- scripts/install | 1 - scripts/restore | 1 - scripts/upgrade | 1 - 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/manifest.toml b/manifest.toml index e84c4bf..b2c9d8e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "OnlyOffice" description.en = "Create and edit documents collaboratively" description.fr = "Créez et éditer des documents collaborativement" -version = "7.5~ynh2" +version = "8.0.1~ynh1" maintainers = [] @@ -72,14 +72,9 @@ ram.runtime = "800M" "libstdc++6", "rabbitmq-server", "libcurl4-openssl-dev", + "ttf-mscorefonts-installer", ] - # Manual install in scripts - # [resources.apt.extras.ttf] - # repo = "deb http://deb.debian.org/debian/ bullseye main contrib" - # key = "https://ftp-master.debian.org/keys/release-bullseye.asc" - # packages = ["ttf-mscorefonts-installer"] - # Manual install in scripts # [resources.apt.extras.onlyoffice] # repo = "https://download.onlyoffice.com/repo/debian squeeze main" diff --git a/scripts/install b/scripts/install index fca5967..aa03bca 100644 --- a/scripts/install +++ b/scripts/install @@ -21,7 +21,6 @@ ynh_app_setting_set --app="$app" --key=jwt_secret --value="$jwt_secret" #================================================= ynh_script_progression --message="Install OnlyOffice..." -_install_msfonts_deb _install_onlyoffice_deb #================================================= diff --git a/scripts/restore b/scripts/restore index 89df2da..e954d93 100644 --- a/scripts/restore +++ b/scripts/restore @@ -20,7 +20,6 @@ ynh_psql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" #================================================= ynh_script_progression --message="Install OnlyOffice..." -_install_msfonts_deb _install_onlyoffice_deb #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index f8cd7d5..7a7a01f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -22,7 +22,6 @@ ynh_script_progression --message="Upgrading OnlyOffice..." ynh_backup_if_checksum_is_different --file="/etc/onlyoffice/documentserver/default.json" -_install_msfonts_deb _install_onlyoffice_deb #================================================= From 7eb281bcf7152f0b8bd2568f27355d6f9d7f43e3 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 17 Apr 2024 21:36:11 +0000 Subject: [PATCH 3/5] Auto-update READMEs --- README.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 60cd1ab..61b8b9c 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.5~ynh2 +**Shipped version:** 8.0.1~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index e4f6d31..98b1838 100644 --- a/README_eu.md +++ b/README_eu.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. -**Paketatutako bertsioa:** 7.5~ynh2 +**Paketatutako bertsioa:** 8.0.1~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index a814e23..2638340 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.5~ynh2 +**Version incluse :** 8.0.1~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index b89530a..bd99e84 100644 --- a/README_gl.md +++ b/README_gl.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. -**Versión proporcionada:** 7.5~ynh2 +**Versión proporcionada:** 8.0.1~ynh1 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index dce2e6d..888503c 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.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. -**分发版本：** 7.5~ynh2 +**分发版本：** 8.0.1~ynh1 **演示：** From a716211c4ee0528df1d5877c91b747eddcf5af3b Mon Sep 17 00:00:00 2001 From: Kayou Date: Wed, 17 Apr 2024 23:37:03 +0200 Subject: [PATCH 4/5] set YNH_INSTALL_APP_DEPENDENCIES_REPLACE to false before calling ynh_install_extra_app_dependencies to avoid removing app dependencies --- scripts/_common.sh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 658bd36..57b23d3 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -8,14 +8,6 @@ # PERSONAL HELPERS #================================================= -_install_msfonts_deb() { - # Run this here because it's less verbose for some reason - ynh_exec_warn_less ynh_install_extra_app_dependencies \ - --repo="deb http://deb.debian.org/debian/ $(lsb_release --codename --short) main contrib" \ - --key="https://ftp-master.debian.org/keys/release-$(lsb_release --release --short).asc" \ - --package="ttf-mscorefonts-installer" -} - _install_onlyoffice_deb() { echo onlyoffice-documentserver onlyoffice/ds-port select "$port" | debconf-set-selections echo onlyoffice-documentserver onlyoffice/db-host string 127.0.0.1 | debconf-set-selections @@ -29,6 +21,9 @@ _install_onlyoffice_deb() { # restart NGINX and the whole webadmin and maybe even the YunoHost command # running the install... + # Do not replace app dependencies + YNH_INSTALL_APP_DEPENDENCIES_REPLACE="false" + # Can't do that in the manifest because we need the debconf-set-selections and postgresql already configured ynh_exec_warn_less ynh_install_extra_app_dependencies \ --repo="https://download.onlyoffice.com/repo/debian squeeze main" \ From 43d5f9daf91978d3edef3de25c211ee327301fc4 Mon Sep 17 00:00:00 2001 From: Kayou Date: Wed, 17 Apr 2024 23:43:38 +0200 Subject: [PATCH 5/5] revert preinstall ttf-mscorefonts-installer, set YNH_INSTALL_APP_DEPENDENCIES_REPLACE to false --- manifest.toml | 7 ++++++- scripts/_common.sh | 12 ++++++++++++ scripts/install | 1 + scripts/restore | 1 + scripts/upgrade | 1 + 5 files changed, 21 insertions(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index b2c9d8e..d6215bf 100644 --- a/manifest.toml +++ b/manifest.toml @@ -72,9 +72,14 @@ ram.runtime = "800M" "libstdc++6", "rabbitmq-server", "libcurl4-openssl-dev", - "ttf-mscorefonts-installer", ] + # Manual install in scripts + # [resources.apt.extras.ttf] + # repo = "deb http://deb.debian.org/debian/ bullseye main contrib" + # key = "https://ftp-master.debian.org/keys/release-bullseye.asc" + # packages = ["ttf-mscorefonts-installer"] + # Manual install in scripts # [resources.apt.extras.onlyoffice] # repo = "https://download.onlyoffice.com/repo/debian squeeze main" diff --git a/scripts/_common.sh b/scripts/_common.sh index 57b23d3..4de1a72 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -8,6 +8,18 @@ # PERSONAL HELPERS #================================================= +_install_msfonts_deb() { + + # Do not replace app dependencies + YNH_INSTALL_APP_DEPENDENCIES_REPLACE="false" + + # Run this here because it's less verbose for some reason + ynh_exec_warn_less ynh_install_extra_app_dependencies \ + --repo="deb http://deb.debian.org/debian/ $(lsb_release --codename --short) main contrib" \ + --key="https://ftp-master.debian.org/keys/release-$(lsb_release --release --short).asc" \ + --package="ttf-mscorefonts-installer" +} + _install_onlyoffice_deb() { echo onlyoffice-documentserver onlyoffice/ds-port select "$port" | debconf-set-selections echo onlyoffice-documentserver onlyoffice/db-host string 127.0.0.1 | debconf-set-selections diff --git a/scripts/install b/scripts/install index aa03bca..fca5967 100644 --- a/scripts/install +++ b/scripts/install @@ -21,6 +21,7 @@ ynh_app_setting_set --app="$app" --key=jwt_secret --value="$jwt_secret" #================================================= ynh_script_progression --message="Install OnlyOffice..." +_install_msfonts_deb _install_onlyoffice_deb #================================================= diff --git a/scripts/restore b/scripts/restore index e954d93..89df2da 100644 --- a/scripts/restore +++ b/scripts/restore @@ -20,6 +20,7 @@ ynh_psql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" #================================================= ynh_script_progression --message="Install OnlyOffice..." +_install_msfonts_deb _install_onlyoffice_deb #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 7a7a01f..f8cd7d5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -22,6 +22,7 @@ ynh_script_progression --message="Upgrading OnlyOffice..." ynh_backup_if_checksum_is_different --file="/etc/onlyoffice/documentserver/default.json" +_install_msfonts_deb _install_onlyoffice_deb #=================================================