Merge pull request #56 from YunoHost-Apps/testing

Testing
2024-09-03 18:06:01 +02:00 · 2024-06-07 19:11:17 +02:00 · 2024-06-07 19:11:17 +02:00 · 24740bfa62
commit 24740bfa62
parent 71dbb94538 7ea3043853
10 changed files with 132 additions and 51 deletions
--- a/ALL_README.md
+++ b/ALL_README.md
@ -1,6 +1,8 @@
 # All available README files by language

 - [Read the README in English](README.md)
+- [Lea el README en español](README_es.md)
 - [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)
+- [阅读中文（简体）的 README](README_zh_Hans.md)
--- a/README_es.md
+++ b/README_es.md
@ -0,0 +1,58 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# Zerobin para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/zerobin.svg)](https://dash.yunohost.org/appci/app/zerobin) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/zerobin.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/zerobin.maintain.svg)
+
+[![Instalar Zerobin con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=zerobin)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarZerobin rapidamente y simplement en un servidor YunoHost.*  
+> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.*
+
+## Descripción general
+
+PrivateBin is a minimalist, open source online pastebin where the server has zero knowledge of pasted data.
+
+Data is encrypted/decrypted in the browser using 256bit AES in Galois Counter mode.
+
+This is a fork of ZeroBin, originally developed by Sébastien Sauvage. It was refactored to allow easier and cleaner extensions and has now much more features than the original. It is however still fully compatible to the original ZeroBin 0.19 data storage scheme. Therefore such installations can be upgraded to this fork without loosing any data.
+
+
+**Versión actual:** 1.7.1~ynh1
+
+**Demo:** <https://privatebin.net/>
+
+## Capturas
+
+![Captura de Zerobin](./doc/screenshots/screenshot.png)
+
+## :red_circle: funcionalidades no deseadas
+
+- **Replaced by another app**: Was replaced by another app. Please refer to the README.
+
+## Documentaciones y recursos
+
+- Sitio web oficial: <https://privatebin.info/>
+- Documentación administrador oficial: <https://github.com/PrivateBin/PrivateBin/wiki>
+- Repositorio del código fuente oficial de la aplicación : <https://github.com/PrivateBin/PrivateBin>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/zerobin>
+- Reportar un error: <https://github.com/YunoHost-Apps/zerobin_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/zerobin_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/zerobin_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade zerobin -u https://github.com/YunoHost-Apps/zerobin_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>
--- a/README_gl.md
+++ b/README_gl.md
@ -31,7 +31,7 @@ This is a fork of ZeroBin, originally developed by Sébastien Sauvage. It was re

 ![Captura de pantalla de Zerobin](./doc/screenshots/screenshot.png)

-## :red_circle: Caraterísticas cuestionables
+## :red_circle: Debes considerar

 - **Replaced by another app**: Was replaced by another app. Please refer to the README.

--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@ -0,0 +1,58 @@
+<!--
+注意：此 README 由 <https://github.com/YunoHost/apps/tree/master/tools/readme_generator> 自动生成
+请勿手动编辑。
+-->
+
+# YunoHost 上的 Zerobin
+
+[![集成程度](https://dash.yunohost.org/integration/zerobin.svg)](https://dash.yunohost.org/appci/app/zerobin) ![工作状态](https://ci-apps.yunohost.org/ci/badges/zerobin.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/zerobin.maintain.svg)
+
+[![使用 YunoHost 安装 Zerobin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=zerobin)
+
+*[阅读此 README 的其它语言版本。](./ALL_README.md)*
+
+> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Zerobin。*  
+> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。*
+
+## 概况
+
+PrivateBin is a minimalist, open source online pastebin where the server has zero knowledge of pasted data.
+
+Data is encrypted/decrypted in the browser using 256bit AES in Galois Counter mode.
+
+This is a fork of ZeroBin, originally developed by Sébastien Sauvage. It was refactored to allow easier and cleaner extensions and has now much more features than the original. It is however still fully compatible to the original ZeroBin 0.19 data storage scheme. Therefore such installations can be upgraded to this fork without loosing any data.
+
+
+**分发版本：** 1.7.1~ynh1
+
+**演示：** <https://privatebin.net/>
+
+## 截图
+
+![Zerobin 的截图](./doc/screenshots/screenshot.png)
+
+## :red_circle: 负面特征
+
+- **Replaced by another app**: Was replaced by another app. Please refer to the README.
+
+## 文档与资源
+
+- 官方应用网站： <https://privatebin.info/>
+- 官方管理文档： <https://github.com/PrivateBin/PrivateBin/wiki>
+- 上游应用代码库： <https://github.com/PrivateBin/PrivateBin>
+- YunoHost 商店： <https://apps.yunohost.org/app/zerobin>
+- 报告 bug： <https://github.com/YunoHost-Apps/zerobin_ynh/issues>
+
+## 开发者信息
+
+请向 [`testing` 分支](https://github.com/YunoHost-Apps/zerobin_ynh/tree/testing) 发送拉取请求。
+
+如要尝试 `testing` 分支，请这样操作：
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/zerobin_ynh/tree/testing --debug
+或
+sudo yunohost app upgrade zerobin -u https://github.com/YunoHost-Apps/zerobin_ynh/tree/testing --debug
+```
+
+**有关应用打包的更多信息：** <https://yunohost.org/packaging_apps>
--- a/manifest.toml
+++ b/manifest.toml
@ -19,7 +19,7 @@ admindoc = "https://github.com/PrivateBin/PrivateBin/wiki"
 code = "https://github.com/PrivateBin/PrivateBin"

 [integration]
-yunohost = ">= 4.3.0"
+yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = true
 ldap = false
@ -30,11 +30,9 @@ ram.runtime = "50M"

 [install]
    [install.domain]
-    # this is a generic question - ask strings are automatically handled by Yunohost's core
    type = "domain"

    [install.path]
-    # this is a generic question - ask strings are automatically handled by Yunohost's core
    type = "path"
    default = "/zerobin"

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

 #=================================================
-# BACKUP THE NGINX CONFIGURATION
+# SYSTEM CONFIGURATION
 #=================================================

 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"

-#=================================================
-# BACKUP THE PHP-FPM CONFIGURATION
-#=================================================
-
 ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"

 #=================================================
--- a/scripts/install
+++ b/scripts/install
@ -23,18 +23,13 @@ chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"

 #=================================================
-# PHP-FPM CONFIGURATION
+# SYSTEM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring PHP-FPM..." --weight=2
+ynh_script_progression --message="Adding system configurations related to $app..." --weight=1

 # Create a dedicated PHP-FPM config
 ynh_add_fpm_config

-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --weight=2
-
 # Create a dedicated NGINX config
 ynh_add_nginx_config

--- a/scripts/remove
+++ b/scripts/remove
@ -10,18 +10,13 @@ source _common.sh
 source /usr/share/yunohost/helpers

 #=================================================
-# REMOVE NGINX CONFIGURATION
+# REMOVE SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression --message="Removing NGINX web server configuration..." --weight=3
+ynh_script_progression --message="Removing system configurations related to $app..." --weight=1

 # Remove the dedicated NGINX config
 ynh_remove_nginx_config

-#=================================================
-# REMOVE PHP-FPM CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1
-
 # Remove the dedicated PHP-FPM config
 ynh_remove_fpm_config

--- a/scripts/restore
+++ b/scripts/restore
@ -24,17 +24,12 @@ chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"

 #=================================================
-# RESTORE THE PHP-FPM CONFIGURATION
+# RESTORE SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=1
+ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1

 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"

-#=================================================
-# RESTORE THE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1
-
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"

 #=================================================
--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -9,26 +9,15 @@
 source _common.sh
 source /usr/share/yunohost/helpers

-#=================================================
-# CHECK VERSION
-#=================================================
-ynh_script_progression --message="Checking version..."
-
-upgrade_type=$(ynh_check_app_version_changed)
-
 #=================================================
 # STANDARD UPGRADE STEPS
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
+ynh_script_progression --message="Upgrading source files..." --weight=3

-if [ "$upgrade_type" == "UPGRADE_APP" ]
-then
-	ynh_script_progression --message="Upgrading source files..." --weight=3
-
-	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$install_dir"
-fi
+# Download, check integrity, uncompress and patch the source from app.src
+ynh_setup_source --dest_dir="$install_dir"

 # Except for data and tmp subdir, where the user must have write permissions
 mkdir -p $install_dir/{data,tmp}
@ -38,18 +27,13 @@ chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"

 #=================================================
-# PHP-FPM CONFIGURATION
+# REAPPLY SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=3
+ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1

 # Create a dedicated PHP-FPM config
 ynh_add_fpm_config

-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2
-
 # Create a dedicated NGINX config
 ynh_add_nginx_config