From c0518f7410ae153cbd34784ff2792f080690814c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 1 Aug 2024 14:07:01 +0000 Subject: [PATCH 1/6] Auto-update READMEs --- ALL_README.md | 1 + README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 61 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 2 +- 8 files changed, 68 insertions(+), 6 deletions(-) create mode 100644 README_id.md diff --git a/ALL_README.md b/ALL_README.md index 152f2e7..4ed64dd 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -5,4 +5,5 @@ - [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) +- [Baca README dalam bahasa bahasa Indonesia](README_id.md) - [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index 33cbbff..f6f1965 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ 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://ci-apps.yunohost.org/ci/apps/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) diff --git a/README_es.md b/README_es.md index a152a94..1e2d907 100644 --- a/README_es.md +++ b/README_es.md @@ -5,7 +5,7 @@ No se debe editar a mano. # OnlyOffice para Yunohost -[![Nivel de integración](https://dash.yunohost.org/integration/onlyoffice.svg)](https://dash.yunohost.org/appci/app/onlyoffice) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/onlyoffice.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/onlyoffice.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/onlyoffice.svg)](https://ci-apps.yunohost.org/ci/apps/onlyoffice/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/onlyoffice.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/onlyoffice.maintain.svg) [![Instalar OnlyOffice con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=onlyoffice) diff --git a/README_eu.md b/README_eu.md index facc119..21880ee 100644 --- a/README_eu.md +++ b/README_eu.md @@ -5,7 +5,7 @@ EZ editatu eskuz. # OnlyOffice YunoHost-erako -[![Integrazio maila](https://dash.yunohost.org/integration/onlyoffice.svg)](https://dash.yunohost.org/appci/app/onlyoffice) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/onlyoffice.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/onlyoffice.maintain.svg) +[![Integrazio maila](https://dash.yunohost.org/integration/onlyoffice.svg)](https://ci-apps.yunohost.org/ci/apps/onlyoffice/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/onlyoffice.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/onlyoffice.maintain.svg) [![Instalatu OnlyOffice YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=onlyoffice) diff --git a/README_fr.md b/README_fr.md index 8438dac..50640af 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main. # 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://ci-apps.yunohost.org/ci/apps/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) diff --git a/README_gl.md b/README_gl.md index 97d5d5c..45eba1c 100644 --- a/README_gl.md +++ b/README_gl.md @@ -5,7 +5,7 @@ NON debe editarse manualmente. # OnlyOffice para YunoHost -[![Nivel de integración](https://dash.yunohost.org/integration/onlyoffice.svg)](https://dash.yunohost.org/appci/app/onlyoffice) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/onlyoffice.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/onlyoffice.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/onlyoffice.svg)](https://ci-apps.yunohost.org/ci/apps/onlyoffice/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/onlyoffice.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/onlyoffice.maintain.svg) [![Instalar OnlyOffice con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=onlyoffice) diff --git a/README_id.md b/README_id.md new file mode 100644 index 0000000..cae63e2 --- /dev/null +++ b/README_id.md @@ -0,0 +1,61 @@ + + +# OnlyOffice untuk YunoHost + +[![Tingkat integrasi](https://dash.yunohost.org/integration/onlyoffice.svg)](https://ci-apps.yunohost.org/ci/apps/onlyoffice/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/onlyoffice.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/onlyoffice.maintain.svg) + +[![Pasang OnlyOffice dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=onlyoffice) + +*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)* + +> *Paket ini memperbolehkan Anda untuk memasang OnlyOffice secara cepat dan mudah pada server YunoHost.* +> *Bila Anda tidak mempunyai YunoHost, silakan berkonsultasi dengan [panduan](https://yunohost.org/install) untuk mempelajari bagaimana untuk memasangnya.* + +## Ringkasan + +ONLYOFFICE Document Server is an online office suite comprising viewers and editors for texts, spreadsheets and presentations, fully compatible with Office Open XML formats: .docx, .xlsx, .pptx and enabling collaborative editing in real time. + +Online collaborative edition of ONLYOFFICE documents requires: +1. a server part, with two installation options: + 1. ONLYOFFICE Document Server packaged for YunoHost. + 2. The [Community Document Server for Nextcloud](https://apps.nextcloud.com/apps/documentserver_community) + +2. a client part, such as: + 1. The [ONLYOFFICE connector for Nextcloud](https://apps.nextcloud.com/apps/onlyoffice) + 2. The [ONLYOFFICE Desktop Editors](https://www.onlyoffice.com/fr/download-desktop.aspx) + +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 terkirim:** 8.0.1~ynh2 + +**Demo:** + +## Tangkapan Layar + +![Tangkapan Layar pada OnlyOffice](./doc/screenshots/01-presentation.jpg) +![Tangkapan Layar pada OnlyOffice](./doc/screenshots/02-document-short.png) + +## Dokumentasi dan sumber daya + +- Website aplikasi resmi: +- Depot kode aplikasi hulu: +- Gudang YunoHost: +- Laporkan bug: + +## Info developer + +Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/onlyoffice_ynh/tree/testing). + +Untuk mencoba branch `testing`, silakan dilanjutkan seperti: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/onlyoffice_ynh/tree/testing --debug +atau +sudo yunohost app upgrade onlyoffice -u https://github.com/YunoHost-Apps/onlyoffice_ynh/tree/testing --debug +``` + +**Info lebih lanjut mengenai pemaketan aplikasi:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 5eced45..a8c2dee 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -5,7 +5,7 @@ # YunoHost 上的 OnlyOffice -[![集成程度](https://dash.yunohost.org/integration/onlyoffice.svg)](https://dash.yunohost.org/appci/app/onlyoffice) ![工作状态](https://ci-apps.yunohost.org/ci/badges/onlyoffice.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/onlyoffice.maintain.svg) +[![集成程度](https://dash.yunohost.org/integration/onlyoffice.svg)](https://ci-apps.yunohost.org/ci/apps/onlyoffice/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/onlyoffice.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/onlyoffice.maintain.svg) [![使用 YunoHost 安装 OnlyOffice](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=onlyoffice) From 0be8e98f08a8e8fdad7a289c60229137bf32e79c Mon Sep 17 00:00:00 2001 From: Kayou Date: Thu, 1 Aug 2024 16:23:32 +0200 Subject: [PATCH 2/6] use resources for deb --- manifest.toml | 20 +++++++++----------- scripts/_common.sh | 11 ++--------- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/manifest.toml b/manifest.toml index 3a50d3c..343e5c5 100644 --- a/manifest.toml +++ b/manifest.toml @@ -74,17 +74,15 @@ ram.runtime = "800M" "libcurl4-openssl-dev", ] - # 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" - # key = "https://download.onlyoffice.com/GPG-KEY-ONLYOFFICE" - # packages = "onlyoffice-documentserver" + [resources.sources.main] + amd64.url = "https://github.com/ONLYOFFICE/DocumentServer/releases/download/v8.0.1/onlyoffice-documentserver_amd64.deb" + amd64.sha256 = "82b2e59ff7d3064a2d35614be7669bec88735f0837dac786762f7ba6a595cff3" + arm64.url = "https://github.com/ONLYOFFICE/DocumentServer/releases/download/v8.0.1/onlyoffice-documentserver_arm64.deb" + arm64.sha256 = "3fe98049dc483b04f9deeaa935795c49ff6086649d7d51a4a8e67e2f1a7c6093" + rename = "onlyoffice-documentserver.deb" + autoupdate.asset.amd64 = "^onlyoffice-documentserver_amd64.deb$" + autoupdate.asset.arm64 = "^onlyoffice-documentserver_arm64.deb$" + autoupdate.strategy = "latest_github_release" [resources.database] type = "postgresql" diff --git a/scripts/_common.sh b/scripts/_common.sh index 4de1a72..7a08b9c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -32,15 +32,8 @@ _install_onlyoffice_deb() { # the install/configure of their package, which is awful since that will # 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" \ - --key="https://download.onlyoffice.com/GPG-KEY-ONLYOFFICE" \ - --package="onlyoffice-documentserver" + + dpkg -i $install_dir/onlyoffice-documentserver.deb } #================================================= From fa82045b91b1f4fc9257a3bb5e95783c62972dde Mon Sep 17 00:00:00 2001 From: Kayou Date: Thu, 1 Aug 2024 16:23:38 +0200 Subject: [PATCH 3/6] add services --- scripts/install | 16 ++++++++++++++++ scripts/remove | 13 +++++++++++-- scripts/restore | 16 ++++++++++++++++ scripts/upgrade | 16 ++++++++++++++++ 4 files changed, 59 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index fca5967..9068b61 100644 --- a/scripts/install +++ b/scripts/install @@ -50,6 +50,22 @@ chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R ds:ds "$install_dir" +#================================================= +# ADVERTISE SERVICE IN ADMIN PANEL +#================================================= + +for service in "ds-converter" "ds-docservice" "ds-metrics"; do + yunohost service add "$service" +done + +#================================================= +# START SERVICES +#================================================= + +for service in "ds-converter" "ds-docservice" "ds-metrics"; do + ynh_systemd_action --action=restart --service_name="$service" +done + #================================================= # NGINX CONFIGURATION #================================================= diff --git a/scripts/remove b/scripts/remove index 93de249..287c8f1 100644 --- a/scripts/remove +++ b/scripts/remove @@ -7,6 +7,17 @@ source _common.sh source /usr/share/yunohost/helpers +#================================================= +# REMOVE SERVICE FROM ADMIN PANEL +#================================================= + +for service in "ds-converter" "ds-docservice" "ds-metrics"; do + if yunohost service status "$service" >/dev/null 2>&1 + then + yunohost service remove "$service" + fi +done + #================================================= # REMOVE ONLYOFFICE #================================================= @@ -25,8 +36,6 @@ ynh_package_autopurge onlyoffice-documentserver dpkg --configure -a -apt-key del "E09C A29F 6E17 8040 EF22 B409 8320 CA65 CB2D E8E5" 2>/dev/null - #================================================= # REMOVE SYSTEM CONFIGURATIONS #================================================= diff --git a/scripts/restore b/scripts/restore index 89df2da..a379264 100644 --- a/scripts/restore +++ b/scripts/restore @@ -59,6 +59,22 @@ ynh_script_progression --message="Restoring system configurations related to $ap ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" +#================================================= +# ADVERTISE SERVICE IN ADMIN PANEL +#================================================= + +for service in "ds-converter" "ds-docservice" "ds-metrics"; do + yunohost service add "$service" +done + +#================================================= +# START SERVICES +#================================================= + +for service in "ds-converter" "ds-docservice" "ds-metrics"; do + ynh_systemd_action --action=restart --service_name="$service" +done + #================================================= # RELOAD NGINX #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index f8cd7d5..e2e760c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -55,6 +55,22 @@ chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R ds:ds "$install_dir" +#================================================= +# ADVERTISE SERVICE IN ADMIN PANEL +#================================================= + +for service in "ds-converter" "ds-docservice" "ds-metrics"; do + yunohost service add "$service" +done + +#================================================= +# START SERVICES +#================================================= + +for service in "ds-converter" "ds-docservice" "ds-metrics"; do + ynh_systemd_action --action=restart --service_name="$service" +done + #================================================= # REAPPLY SYSTEM CONFIGURATIONS #================================================= From 5fa18d0f037d73f30e878c6160bd66238e5375cf Mon Sep 17 00:00:00 2001 From: Kayou Date: Thu, 1 Aug 2024 16:31:38 +0200 Subject: [PATCH 4/6] fix dpkg --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 7a08b9c..1cb838f 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -33,7 +33,7 @@ _install_onlyoffice_deb() { # restart NGINX and the whole webadmin and maybe even the YunoHost command # running the install... - dpkg -i $install_dir/onlyoffice-documentserver.deb + dpkg -i onlyoffice-documentserver.deb } #================================================= From fcd662da5f253291702f06921c70e757e7a2d8b5 Mon Sep 17 00:00:00 2001 From: Kayou Date: Thu, 1 Aug 2024 16:41:52 +0200 Subject: [PATCH 5/6] =?UTF-8?q?=C2=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/_common.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 1cb838f..9dfea90 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -33,7 +33,8 @@ _install_onlyoffice_deb() { # restart NGINX and the whole webadmin and maybe even the YunoHost command # running the install... - dpkg -i onlyoffice-documentserver.deb + ynh_setup_source --dest_dir="$install_dir" + dpkg -i $install_dir/onlyoffice-documentserver.deb } #================================================= From b4514d647b2d088c9eb02f46ee9c48ce75fee247 Mon Sep 17 00:00:00 2001 From: Kayou Date: Thu, 1 Aug 2024 16:53:34 +0200 Subject: [PATCH 6/6] try with ynh_package_install --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 9dfea90..99d4be9 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -34,7 +34,7 @@ _install_onlyoffice_deb() { # running the install... ynh_setup_source --dest_dir="$install_dir" - dpkg -i $install_dir/onlyoffice-documentserver.deb + ynh_package_install $install_dir/onlyoffice-documentserver.deb } #=================================================