From 9dcd5573f6819a2ce2bce2ebd85e61006ddec054 Mon Sep 17 00:00:00 2001 From: Mateusz <2871798+orhtej2@users.noreply.github.com> Date: Tue, 23 Jul 2024 10:48:05 +0200 Subject: [PATCH 1/7] Fix tomcat dependency --- manifest.toml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/manifest.toml b/manifest.toml index 3a84dbe..0a4e49b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -50,27 +50,27 @@ ram.runtime = "50M" [resources] [resources.sources] [resources.sources.server] - url = "https://downloads.apache.org/guacamole/1.5.4/source/guacamole-server-1.5.4.tar.gz" - sha256 = "4c0add552b1fc387c23a35c430155e01f2dfcf9daa0f96fbf805d0ace756729e" + url = "https://downloads.apache.org/guacamole/1.5.5/source/guacamole-server-1.5.5.tar.gz" + sha256 = "67499611c2e22d9c933763adc5408e716a4bfd08a3eb8a5ba2fc6f8f70868f6b" [resources.sources.client] - url = "https://downloads.apache.org/guacamole/1.5.4/binary/guacamole-1.5.4.war" - sha256 = "5728b563911bd64bce0a0b81c74ea8ccb2190d1785bff34030fc6885a8273d3e" + url = "https://downloads.apache.org/guacamole/1.5.5/binary/guacamole-1.5.5.war" + sha256 = "4267307f3600663723f24af92d596e99c8359425315135052a42d451f9529200" format = "zip" extract = false rename = "guacamole.war" [resources.sources.auth-header] - url = "https://downloads.apache.org/guacamole/1.5.4/binary/guacamole-auth-header-1.5.4.tar.gz" - sha256 = "7a0adc0daa19ec69a0244f491222c62124b02f81f40aa91e9a94d06a2635d038" + url = "https://downloads.apache.org/guacamole/1.5.5/binary/guacamole-auth-header-1.5.5.tar.gz" + sha256 = "a39ca9563be6d31b4dc1251c76a62baeb2a9d4930b3055e342bb9ce80e526a78" [resources.sources.auth-ldap] - url = "https://downloads.apache.org/guacamole/1.5.4/binary/guacamole-auth-ldap-1.5.4.tar.gz" - sha256 = "f912fe921cd0d429a752709e31a37b931e95d88a47bc4007ab49377d1c1a6336" + url = "https://downloads.apache.org/guacamole/1.5.5/binary/guacamole-auth-ldap-1.5.5.tar.gz" + sha256 = "01d3cd74da5de9da9cc73a788ab2938dd44f5cbe42ad90eebb4bee07f246dfa3" [resources.sources.auth-jdbc] - url = "https://downloads.apache.org/guacamole/1.5.4/binary/guacamole-auth-jdbc-1.5.4.tar.gz" - sha256 = "f45736b28eb6647b7eb0d2b48331e12e5a432661f61115b63d1a05a5bd20244d" + url = "https://downloads.apache.org/guacamole/1.5.5/binary/guacamole-auth-jdbc-1.5.5.tar.gz" + sha256 = "80cca0a02076babad0dc7c76b60daa896f3d9bf10be82708f425fd42ce411393" [resources.sources.mariadb-java-client] url = "https://downloads.mariadb.com/Connectors/java/connector-java-2.7.4/mariadb-java-client-2.7.4.jar" @@ -79,13 +79,6 @@ ram.runtime = "50M" extract = false rename = "mariadb-java-client.jar" - [resources.sources.tomcat9_deb] - url = "https://ftp.debian.org/debian/pool/main/t/tomcat9/tomcat9_9.0.43-2~deb11u9_all.deb" - sha256 = "e016d55fd13bb51906106ede43fd970001f9b23db89628ddcbcca11e10a6068f" - format = "whatever" - extract = false - rename = "tomcat9.deb" - [resources.ports] main.default = 8080 guacd.default = 4822 @@ -121,8 +114,15 @@ ram.runtime = "50M" "libssl-dev", "libvorbis-dev", "libwebp-dev", - "tomcat9\\|tomcat10", ] + packages_from_raw_bash = """ + if [[ $YNH_DEBIAN_VERSION = "bullseye" ]]; then + echo "tomcat9"; + elif [[ $YNH_DEBIAN_VERSION = "bookworm" ]]; then + echo "tomcat10"; + fi + """ + [resources.database] type = "mysql" From 7d5a0c8c1aea9cbc69d4afbe2f98643d7acfb51b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 23 Jul 2024 08:48:18 +0000 Subject: [PATCH 2/7] 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 | 47 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 2 +- 8 files changed, 54 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 62c2d9d..fc6beea 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Guacamole for YunoHost -[![Integration level](https://dash.yunohost.org/integration/guacamole.svg)](https://dash.yunohost.org/appci/app/guacamole) ![Working status](https://ci-apps.yunohost.org/ci/badges/guacamole.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/guacamole.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/guacamole.svg)](https://ci-apps.yunohost.org/ci/apps/guacamole/) ![Working status](https://ci-apps.yunohost.org/ci/badges/guacamole.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/guacamole.maintain.svg) [![Install Guacamole with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=guacamole) diff --git a/README_es.md b/README_es.md index e29fecb..3eb49ba 100644 --- a/README_es.md +++ b/README_es.md @@ -5,7 +5,7 @@ No se debe editar a mano. # Guacamole para Yunohost -[![Nivel de integración](https://dash.yunohost.org/integration/guacamole.svg)](https://dash.yunohost.org/appci/app/guacamole) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/guacamole.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/guacamole.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/guacamole.svg)](https://ci-apps.yunohost.org/ci/apps/guacamole/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/guacamole.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/guacamole.maintain.svg) [![Instalar Guacamole con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=guacamole) diff --git a/README_eu.md b/README_eu.md index a5f714e..559c297 100644 --- a/README_eu.md +++ b/README_eu.md @@ -5,7 +5,7 @@ EZ editatu eskuz. # Guacamole YunoHost-erako -[![Integrazio maila](https://dash.yunohost.org/integration/guacamole.svg)](https://dash.yunohost.org/appci/app/guacamole) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/guacamole.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/guacamole.maintain.svg) +[![Integrazio maila](https://dash.yunohost.org/integration/guacamole.svg)](https://ci-apps.yunohost.org/ci/apps/guacamole/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/guacamole.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/guacamole.maintain.svg) [![Instalatu Guacamole YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=guacamole) diff --git a/README_fr.md b/README_fr.md index 5be6f4d..70f243c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main. # Guacamole pour YunoHost -[![Niveau d’intégration](https://dash.yunohost.org/integration/guacamole.svg)](https://dash.yunohost.org/appci/app/guacamole) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/guacamole.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/guacamole.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/guacamole.svg)](https://ci-apps.yunohost.org/ci/apps/guacamole/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/guacamole.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/guacamole.maintain.svg) [![Installer Guacamole avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=guacamole) diff --git a/README_gl.md b/README_gl.md index 5df88cb..f8da905 100644 --- a/README_gl.md +++ b/README_gl.md @@ -5,7 +5,7 @@ NON debe editarse manualmente. # Guacamole para YunoHost -[![Nivel de integración](https://dash.yunohost.org/integration/guacamole.svg)](https://dash.yunohost.org/appci/app/guacamole) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/guacamole.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/guacamole.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/guacamole.svg)](https://ci-apps.yunohost.org/ci/apps/guacamole/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/guacamole.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/guacamole.maintain.svg) [![Instalar Guacamole con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=guacamole) diff --git a/README_id.md b/README_id.md new file mode 100644 index 0000000..879f754 --- /dev/null +++ b/README_id.md @@ -0,0 +1,47 @@ + + +# Guacamole untuk YunoHost + +[![Tingkat integrasi](https://dash.yunohost.org/integration/guacamole.svg)](https://ci-apps.yunohost.org/ci/apps/guacamole/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/guacamole.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/guacamole.maintain.svg) + +[![Pasang Guacamole dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=guacamole) + +*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)* + +> *Paket ini memperbolehkan Anda untuk memasang Guacamole 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 + +Guacamole is a clientless remote desktop gateway. It supports standard protocols like VNC, RDP, and SSH + +**Versi terkirim:** 1.5.4~ynh1 + +## Tangkapan Layar + +![Tangkapan Layar pada Guacamole](./doc/screenshots/screenshot1.jpg) + +## Dokumentasi dan sumber daya + +- Website aplikasi resmi: +- Dokumentasi admin resmi: +- Repositori kode aplikasi hulu: +- Gudang YunoHost: +- Laporkan bug: + +## Info developer + +Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/guacamole_ynh/tree/testing). + +Untuk mencoba branch `testing`, silakan dilanjutkan seperti: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/guacamole_ynh/tree/testing --debug +atau +sudo yunohost app upgrade guacamole -u https://github.com/YunoHost-Apps/guacamole_ynh/tree/testing --debug +``` + +**Info lebih lanjut mengenai pemaketan aplikasi:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 5e1358a..5505c6c 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -5,7 +5,7 @@ # YunoHost 上的 Guacamole -[![集成程度](https://dash.yunohost.org/integration/guacamole.svg)](https://dash.yunohost.org/appci/app/guacamole) ![工作状态](https://ci-apps.yunohost.org/ci/badges/guacamole.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/guacamole.maintain.svg) +[![集成程度](https://dash.yunohost.org/integration/guacamole.svg)](https://ci-apps.yunohost.org/ci/apps/guacamole/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/guacamole.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/guacamole.maintain.svg) [![使用 YunoHost 安装 Guacamole](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=guacamole) From 63176250392be8e7d4714c0a3182466554c49854 Mon Sep 17 00:00:00 2001 From: Mateusz <2871798+orhtej2@users.noreply.github.com> Date: Tue, 23 Jul 2024 10:48:36 +0200 Subject: [PATCH 3/7] bump version --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 0a4e49b..69262e5 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Guacamole" description.en = "Clientless remote desktop gateway. It supports standard protocols like VNC, RDP, and SSH" description.fr = "Service de bureau à distance sans client. Fonctionne avec des protocoles standard comme VNC, RDP, et SSH" -version = "1.5.4~ynh1" +version = "1.5.5~ynh1" maintainers = ["Jules Bertholet"] From acd15283cf2c31fc9d0a21776f3ea38f1ff9709b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 23 Jul 2024 08:48:40 +0000 Subject: [PATCH 4/7] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_zh_Hans.md | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index fc6beea..937f98e 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ It shall NOT be edited by hand. Guacamole is a clientless remote desktop gateway. It supports standard protocols like VNC, RDP, and SSH -**Shipped version:** 1.5.4~ynh1 +**Shipped version:** 1.5.5~ynh1 ## Screenshots diff --git a/README_es.md b/README_es.md index 3eb49ba..ce8207f 100644 --- a/README_es.md +++ b/README_es.md @@ -18,7 +18,7 @@ No se debe editar a mano. Guacamole is a clientless remote desktop gateway. It supports standard protocols like VNC, RDP, and SSH -**Versión actual:** 1.5.4~ynh1 +**Versión actual:** 1.5.5~ynh1 ## Capturas diff --git a/README_eu.md b/README_eu.md index 559c297..91a6fae 100644 --- a/README_eu.md +++ b/README_eu.md @@ -18,7 +18,7 @@ EZ editatu eskuz. Guacamole is a clientless remote desktop gateway. It supports standard protocols like VNC, RDP, and SSH -**Paketatutako bertsioa:** 1.5.4~ynh1 +**Paketatutako bertsioa:** 1.5.5~ynh1 ## Pantaila-argazkiak diff --git a/README_fr.md b/README_fr.md index 70f243c..650c11b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main. Guacamole is a clientless remote desktop gateway. It supports standard protocols like VNC, RDP, and SSH -**Version incluse :** 1.5.4~ynh1 +**Version incluse :** 1.5.5~ynh1 ## Captures d’écran diff --git a/README_gl.md b/README_gl.md index f8da905..10e03c3 100644 --- a/README_gl.md +++ b/README_gl.md @@ -18,7 +18,7 @@ NON debe editarse manualmente. Guacamole is a clientless remote desktop gateway. It supports standard protocols like VNC, RDP, and SSH -**Versión proporcionada:** 1.5.4~ynh1 +**Versión proporcionada:** 1.5.5~ynh1 ## Capturas de pantalla diff --git a/README_id.md b/README_id.md index 879f754..cfe8ec8 100644 --- a/README_id.md +++ b/README_id.md @@ -18,7 +18,7 @@ Ini TIDAK boleh diedit dengan tangan. Guacamole is a clientless remote desktop gateway. It supports standard protocols like VNC, RDP, and SSH -**Versi terkirim:** 1.5.4~ynh1 +**Versi terkirim:** 1.5.5~ynh1 ## Tangkapan Layar diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 5505c6c..2c56d5a 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -18,7 +18,7 @@ Guacamole is a clientless remote desktop gateway. It supports standard protocols like VNC, RDP, and SSH -**分发版本：** 1.5.4~ynh1 +**分发版本：** 1.5.5~ynh1 ## 截图 From a6ab2dea7be55588fb2e58ccc9884de32e7fce79 Mon Sep 17 00:00:00 2001 From: Mateusz Szymanski <2871798+orhtej2@users.noreply.github.com> Date: Tue, 23 Jul 2024 11:48:17 +0200 Subject: [PATCH 5/7] Partial revert --- manifest.toml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/manifest.toml b/manifest.toml index 69262e5..8078929 100644 --- a/manifest.toml +++ b/manifest.toml @@ -79,6 +79,13 @@ ram.runtime = "50M" extract = false rename = "mariadb-java-client.jar" + [resources.sources.tomcat9_deb] + url = "https://ftp.debian.org/debian/pool/main/t/tomcat9/tomcat9_9.0.43-2~deb11u10_all.deb" + sha256 = "0dd30fee78ecd3980e9ee3ba018071755ddf84e2288b860900709f1013e368ed" + format = "whatever" + extract = false + rename = "tomcat9.deb" + [resources.ports] main.default = 8080 guacd.default = 4822 From ebbccacb013da5cac1427ca07ad3997f5bc29f45 Mon Sep 17 00:00:00 2001 From: Mateusz <2871798+orhtej2@users.noreply.github.com> Date: Tue, 23 Jul 2024 12:30:07 +0200 Subject: [PATCH 6/7] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 11a92d5..9bf72cb 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -guacamole_version="1.5.4" +guacamole_version="1.5.5" #================================================= # PERSONAL HELPERS From bc1a59a4cb34678e116040f3ca5acabc02530bf6 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 6 Aug 2024 08:25:36 +0000 Subject: [PATCH 7/7] Auto-update READMEs --- README_id.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_id.md b/README_id.md index cfe8ec8..fe2a272 100644 --- a/README_id.md +++ b/README_id.md @@ -28,7 +28,7 @@ Guacamole is a clientless remote desktop gateway. It supports standard protocols - Website aplikasi resmi: - Dokumentasi admin resmi: -- Repositori kode aplikasi hulu: +- Depot kode aplikasi hulu: - Gudang YunoHost: - Laporkan bug: