Merge pull request #8 from YunoHost-Apps/testing

Testing
2024-09-03 19:36:37 +02:00 · 2024-07-22 21:35:00 +02:00 · 2024-07-22 21:35:00 +02:00 · 57cbaa39f5
commit 57cbaa39f5
parent 545d3bbbe6 8e6f15fcc8
13 changed files with 70 additions and 47 deletions
--- 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)
--- a/README.md
+++ b/README.md
@ -5,7 +5,7 @@ It shall NOT be edited by hand.

 # Matrix IRC Bridge for YunoHost

-[![Integration level](https://dash.yunohost.org/integration/matrix-appservice-irc.svg)](https://dash.yunohost.org/appci/app/matrix-appservice-irc) ![Working status](https://ci-apps.yunohost.org/ci/badges/matrix-appservice-irc.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/matrix-appservice-irc.maintain.svg)
+[![Integration level](https://dash.yunohost.org/integration/matrix-appservice-irc.svg)](https://ci-apps.yunohost.org/ci/apps/matrix-appservice-irc/) ![Working status](https://ci-apps.yunohost.org/ci/badges/matrix-appservice-irc.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/matrix-appservice-irc.maintain.svg)

 [![Install Matrix IRC Bridge with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=matrix-appservice-irc)

@ -28,7 +28,7 @@ It is highly configurable and is currently used on the matrix.org homeserver to
 - Well-formated replies


-**Shipped version:** 0.36.0~ynh2
+**Shipped version:** 0.36.0~ynh3
 ## Documentation and resources

 - Official user documentation: <https://matrix-org.github.io/matrix-appservice-irc/latest/usage>
--- a/README_es.md
+++ b/README_es.md
@ -5,7 +5,7 @@ No se debe editar a mano.

 # Matrix IRC Bridge para Yunohost

-[![Nivel de integración](https://dash.yunohost.org/integration/matrix-appservice-irc.svg)](https://dash.yunohost.org/appci/app/matrix-appservice-irc) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/matrix-appservice-irc.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/matrix-appservice-irc.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/matrix-appservice-irc.svg)](https://ci-apps.yunohost.org/ci/apps/matrix-appservice-irc/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/matrix-appservice-irc.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/matrix-appservice-irc.maintain.svg)

 [![Instalar Matrix IRC Bridge con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=matrix-appservice-irc)

@ -28,7 +28,7 @@ It is highly configurable and is currently used on the matrix.org homeserver to
 - Well-formated replies


-**Versión actual:** 0.36.0~ynh2
+**Versión actual:** 0.36.0~ynh3
 ## Documentaciones y recursos

 - Documentación usuario oficial: <https://matrix-org.github.io/matrix-appservice-irc/latest/usage>
--- a/README_eu.md
+++ b/README_eu.md
@ -5,7 +5,7 @@ EZ editatu eskuz.

 # Matrix IRC Bridge YunoHost-erako

-[![Integrazio maila](https://dash.yunohost.org/integration/matrix-appservice-irc.svg)](https://dash.yunohost.org/appci/app/matrix-appservice-irc) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/matrix-appservice-irc.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/matrix-appservice-irc.maintain.svg)
+[![Integrazio maila](https://dash.yunohost.org/integration/matrix-appservice-irc.svg)](https://ci-apps.yunohost.org/ci/apps/matrix-appservice-irc/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/matrix-appservice-irc.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/matrix-appservice-irc.maintain.svg)

 [![Instalatu Matrix IRC Bridge YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=matrix-appservice-irc)

@ -28,7 +28,7 @@ It is highly configurable and is currently used on the matrix.org homeserver to
 - Well-formated replies


-**Paketatutako bertsioa:** 0.36.0~ynh2
+**Paketatutako bertsioa:** 0.36.0~ynh3
 ## Dokumentazioa eta baliabideak

 - Erabiltzaileen dokumentazio ofiziala: <https://matrix-org.github.io/matrix-appservice-irc/latest/usage>
--- a/README_fr.md
+++ b/README_fr.md
@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main.

 # Matrix IRC Bridge pour YunoHost

-[![Niveau d’intégration](https://dash.yunohost.org/integration/matrix-appservice-irc.svg)](https://dash.yunohost.org/appci/app/matrix-appservice-irc) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/matrix-appservice-irc.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/matrix-appservice-irc.maintain.svg)
+[![Niveau d’intégration](https://dash.yunohost.org/integration/matrix-appservice-irc.svg)](https://ci-apps.yunohost.org/ci/apps/matrix-appservice-irc/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/matrix-appservice-irc.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/matrix-appservice-irc.maintain.svg)

 [![Installer Matrix IRC Bridge avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=matrix-appservice-irc)

@ -28,7 +28,7 @@ Elle est hautement configurable, et est actuellement uilisée sur matrix.org pou
 - Réponses formattées proprement


-**Version incluse :** 0.36.0~ynh2
+**Version incluse :** 0.36.0~ynh3
 ## Documentations et ressources

 - Documentation officielle utilisateur : <https://matrix-org.github.io/matrix-appservice-irc/latest/usage>
--- a/README_gl.md
+++ b/README_gl.md
@ -5,7 +5,7 @@ NON debe editarse manualmente.

 # Matrix IRC Bridge para YunoHost

-[![Nivel de integración](https://dash.yunohost.org/integration/matrix-appservice-irc.svg)](https://dash.yunohost.org/appci/app/matrix-appservice-irc) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/matrix-appservice-irc.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/matrix-appservice-irc.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/matrix-appservice-irc.svg)](https://ci-apps.yunohost.org/ci/apps/matrix-appservice-irc/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/matrix-appservice-irc.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/matrix-appservice-irc.maintain.svg)

 [![Instalar Matrix IRC Bridge con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=matrix-appservice-irc)

@ -28,7 +28,7 @@ It is highly configurable and is currently used on the matrix.org homeserver to
 - Well-formated replies


-**Versión proporcionada:** 0.36.0~ynh2
+**Versión proporcionada:** 0.36.0~ynh3
 ## Documentación e recursos

 - Documentación oficial para usuarias: <https://matrix-org.github.io/matrix-appservice-irc/latest/usage>
--- a/README_id.md
+++ b/README_id.md
@ -0,0 +1,52 @@
+<!--
+N.B.: README ini dibuat secara otomatis oleh <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Ini TIDAK boleh diedit dengan tangan.
+-->
+
+# Matrix IRC Bridge untuk YunoHost
+
+[![Tingkat integrasi](https://dash.yunohost.org/integration/matrix-appservice-irc.svg)](https://ci-apps.yunohost.org/ci/apps/matrix-appservice-irc/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/matrix-appservice-irc.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/matrix-appservice-irc.maintain.svg)
+
+[![Pasang Matrix IRC Bridge dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=matrix-appservice-irc)
+
+*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)*
+
+> *Paket ini memperbolehkan Anda untuk memasang Matrix IRC Bridge 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
+
+This is an IRC bridge for Matrix. 
+
+This bridge will pass all IRC messages through to Matrix, and all Matrix messages through to IRC.
+It is highly configurable and is currently used on the matrix.org homeserver to bridge a number of popular IRC networks.
+
+### Features
+
+- Merge Matrix rooms to IRC channels
+- Full two-way communication in channels and direct messages
+- Well-formated replies
+
+
+**Versi terkirim:** 0.36.0~ynh3
+## Dokumentasi dan sumber daya
+
+- Dokumentasi pengguna resmi: <https://matrix-org.github.io/matrix-appservice-irc/latest/usage>
+- Dokumentasi admin resmi: <https://matrix-org.github.io/matrix-appservice-irc/latest/bridge_setup>
+- Repositori kode aplikasi hulu: <https://github.com/matrix-org/matrix-appservice-irc>
+- Gudang YunoHost: <https://apps.yunohost.org/app/matrix-appservice-irc>
+- Laporkan bug: <https://github.com/YunoHost-Apps/matrix-appservice-irc_ynh/issues>
+
+## Info developer
+
+Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/matrix-appservice-irc_ynh/tree/testing).
+
+Untuk mencoba branch `testing`, silakan dilanjutkan seperti:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/matrix-appservice-irc_ynh/tree/testing --debug
+atau
+sudo yunohost app upgrade matrix-appservice-irc -u https://github.com/YunoHost-Apps/matrix-appservice-irc_ynh/tree/testing --debug
+```
+
+**Info lebih lanjut mengenai pemaketan aplikasi:** <https://yunohost.org/packaging_apps>
--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@ -5,7 +5,7 @@

 # YunoHost 上的 Matrix IRC Bridge

-[![集成程度](https://dash.yunohost.org/integration/matrix-appservice-irc.svg)](https://dash.yunohost.org/appci/app/matrix-appservice-irc) ![工作状态](https://ci-apps.yunohost.org/ci/badges/matrix-appservice-irc.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/matrix-appservice-irc.maintain.svg)
+[![集成程度](https://dash.yunohost.org/integration/matrix-appservice-irc.svg)](https://ci-apps.yunohost.org/ci/apps/matrix-appservice-irc/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/matrix-appservice-irc.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/matrix-appservice-irc.maintain.svg)

 [![使用 YunoHost 安装 Matrix IRC Bridge](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=matrix-appservice-irc)

@ -28,7 +28,7 @@ It is highly configurable and is currently used on the matrix.org homeserver to
 - Well-formated replies


-**分发版本：** 0.36.0~ynh2
+**分发版本：** 0.36.0~ynh3
 ## 文档与资源

 - 官方用户文档： <https://matrix-org.github.io/matrix-appservice-irc/latest/usage>
--- a/manifest.toml
+++ b/manifest.toml
@ -7,7 +7,7 @@ name = "Matrix IRC Bridge"
 description.en = "Matrix bridge for IRC"
 description.fr = "Passerelle Matrix pour IRC"

-version = "0.36.0~ynh2"
+version = "0.36.0~ynh3"

 maintainers = ["Salamandar"]

--- a/scripts/backup
+++ b/scripts/backup
@ -22,17 +22,11 @@ ynh_print_info --message="Declaring files to be backed up..."
 ynh_backup --src_path="$install_dir"

 #=================================================
-# SPECIFIC BACKUP
-#=================================================
-# BACKUP LOGROTATE
+# SYSTEM CONFIGURATION
 #=================================================

 ynh_backup --src_path="/etc/logrotate.d/$app"

-#=================================================
-# BACKUP SYSTEMD
-#=================================================
-
 ynh_backup --src_path="/etc/systemd/system/$app.service"

 #=================================================
--- a/scripts/install
+++ b/scripts/install
@ -46,6 +46,7 @@ ynh_script_progression --message="Setting up source files and building the app..

 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$install_dir"
+
 chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R "$app:$app" "$install_dir"
@ -61,7 +62,7 @@ chown -R "$app:$app" "$install_dir"
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1

-ynh_add_config --template="../conf/config.yaml" --destination="$install_dir/config.yaml"
+ynh_add_config --template="config.yaml" --destination="$install_dir/config.yaml"

 chmod 400 "$install_dir/config.yaml"
 chown "$app:$app" "$install_dir/config.yaml"
--- a/scripts/remove
+++ b/scripts/remove
@ -22,43 +22,18 @@ then
 	yunohost service remove $app
 fi

-#=================================================
-# STOP AND REMOVE SERVICE
-#=================================================
-ynh_script_progression --message="Stopping and removing the systemd service..." --weight=1
-
 # Remove the dedicated systemd config
 ynh_remove_systemd_config

-#=================================================
-# REMOVE LOGROTATE CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing logrotate configuration..." --weight=1
-
 # Remove the app-specific logrotate config
 ynh_remove_logrotate

-#=================================================
-# REMOVE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Removing dependencies..." --weight=1
-
 ynh_remove_nodejs

-#=================================================
-# SPECIFIC REMOVE
-#=================================================
-# REMOVE VARIOUS FILES
-#=================================================
-ynh_script_progression --message="Removing synapse app service..." --weight=6
-
 # Remove a directory securely
 ynh_secure_remove --file="/etc/matrix-$synapse_instance/app-service/$app.yaml"
 "/opt/yunohost/matrix-$synapse_instance/update_synapse_for_appservice.sh" || ynh_die --message="Synapse can't restart with the appservice configuration"

-# Remove the log files
-ynh_secure_remove --file="/var/log/$app"
-
 #=================================================
 # END OF SCRIPT
 #=================================================
--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -76,7 +76,7 @@ print(yaml.dump(c['ircService']['servers']))")

 ### Same as during install

-ynh_add_config --template="../conf/config.yaml" --destination="$install_dir/config.yaml"
+ynh_add_config --template="config.yaml" --destination="$install_dir/config.yaml"

 # Try to recover the previously configured IRC servers.
 python3 -c "import yaml