Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Testing #123

Merged
merged 6 commits into from
Apr 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:** <https://www.onlyoffice.com/fr/download-desktop.aspx>

Expand Down
2 changes: 1 addition & 1 deletion README_eu.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:** <https://www.onlyoffice.com/fr/download-desktop.aspx>

Expand Down
2 changes: 1 addition & 1 deletion README_fr.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 :** <https://www.onlyoffice.com/fr/download-desktop.aspx>

Expand Down
2 changes: 1 addition & 1 deletion README_gl.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:** <https://www.onlyoffice.com/fr/download-desktop.aspx>

Expand Down
2 changes: 1 addition & 1 deletion README_zh_Hans.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

**演示:** <https://www.onlyoffice.com/fr/download-desktop.aspx>

Expand Down
2 changes: 1 addition & 1 deletion doc/ADMIN.md
Original file line number Diff line number Diff line change
Expand Up @@ -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?

Expand Down
2 changes: 1 addition & 1 deletion manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []

Expand Down
7 changes: 7 additions & 0 deletions scripts/_common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
#=================================================

_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" \
Expand All @@ -29,6 +33,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" \
Expand Down