From 5624a88c91e3e59caefab080b5e68b57e518ae31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 26 May 2024 15:58:15 +0200 Subject: [PATCH 1/3] cleaning --- scripts/backup | 12 +----------- scripts/restore | 2 +- scripts/upgrade | 18 ++++-------------- 3 files changed, 6 insertions(+), 26 deletions(-) diff --git a/scripts/backup b/scripts/backup index 0f27135..b3c4ac3 100755 --- a/scripts/backup +++ b/scripts/backup @@ -22,23 +22,13 @@ 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" -#================================================= -# SPECIFIC BACKUP -#================================================= -# BACKUP LOGROTATE -#================================================= - ynh_backup --src_path="/etc/logrotate.d/$app" #================================================= diff --git a/scripts/restore b/scripts/restore index 797fa49..17b8eb8 100755 --- a/scripts/restore +++ b/scripts/restore @@ -23,7 +23,7 @@ chown -R $app:www-data "$install_dir" #================================================= # RESTORE SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=4 +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" ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$phpversion diff --git a/scripts/upgrade b/scripts/upgrade index f2cbe56..e90aa0f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,12 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) - #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= @@ -52,14 +46,10 @@ fi #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." --weight=5 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." --weight=5 - - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir/app" --keep="data/_data_/_default_/configs/application.ini" -fi +# Download, check integrity, uncompress and patch the source from app.src +ynh_setup_source --dest_dir="$install_dir/app" --keep="data/_data_/_default_/configs/application.ini" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" @@ -95,7 +85,7 @@ ynh_use_logrotate --non-append #================================================= ynh_script_progression --message="Applying SSO patch..." --weight=1 -ynh_add_config --template="../conf/sso.php" --destination="$install_dir/index.php" +ynh_add_config --template="sso.php" --destination="$install_dir/index.php" #================================================= # END OF SCRIPT From 782c8695054327db5e34bb5c0260a655865fd739 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 26 May 2024 13:58:19 +0000 Subject: [PATCH 2/3] Auto-update READMEs --- ALL_README.md | 1 + README_es.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 2 +- 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 README_es.md diff --git a/ALL_README.md b/ALL_README.md index a01b345..152f2e7 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,6 +1,7 @@ # 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) diff --git a/README_es.md b/README_es.md new file mode 100644 index 0000000..d4cc671 --- /dev/null +++ b/README_es.md @@ -0,0 +1,50 @@ + + +# SnappyMail para Yunohost + +[![Nivel de integración](https://dash.yunohost.org/integration/snappymail.svg)](https://dash.yunohost.org/appci/app/snappymail) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/snappymail.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/snappymail.maintain.svg) + +[![Instalar SnappyMail con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=snappymail) + +*[Leer este README en otros idiomas.](./ALL_README.md)* + +> *Este paquete le permite instalarSnappyMail 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 + +Simple, modern, lightweight & fast web-based email client. The drastically upgraded & secured fork of RainLoop Webmail Community edition. + + +**Versión actual:** 2.36.1~ynh1 + +**Demo:** + +## Capturas + +![Captura de SnappyMail](./doc/screenshots/screenshot.png) + +## Documentaciones y recursos + +- Sitio web oficial: +- Documentación administrador oficial: +- Repositorio del código fuente oficial de la aplicación : +- Catálogo YunoHost: +- Reportar un error: + +## Información para desarrolladores + +Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/snappymail_ynh/tree/testing + +Para probar la rama `testing`, sigue asÍ: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/snappymail_ynh/tree/testing --debug +o +sudo yunohost app upgrade snappymail -u https://github.com/YunoHost-Apps/snappymail_ynh/tree/testing --debug +``` + +**Mas informaciones sobre el empaquetado de aplicaciones:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index bd8fa95..a6ead04 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -3,7 +3,7 @@ 请勿手动编辑。 --> -# YunoHost 的 SnappyMail +# YunoHost 上的 SnappyMail [![集成程度](https://dash.yunohost.org/integration/snappymail.svg)](https://dash.yunohost.org/appci/app/snappymail) ![工作状态](https://ci-apps.yunohost.org/ci/badges/snappymail.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/snappymail.maintain.svg) From 6a9783319550e211e5a8d7f917e97d3e833b6969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 26 May 2024 15:59:48 +0200 Subject: [PATCH 3/3] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 5c3e4d8..de72ed0 100644 --- a/manifest.toml +++ b/manifest.toml @@ -46,8 +46,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/the-djmaze/snappymail/releases/download/v2.36.1/snappymail-2.36.1.tar.gz" - sha256 = "0e3e25ca0d33fd67f2f825161c726d48d1db8ad1662c968b95eb71ca25ddae65" + url = "https://github.com/the-djmaze/snappymail/releases/download/v2.36.2/snappymail-2.36.2.tar.gz" + sha256 = "a9e4661ca48d770d08a32ddb800ff75e7a645bacb8a310cae7b24e9c38788ff2" in_subdir = false autoupdate.strategy = "latest_github_release" autoupdate.asset = "^snappymail-[0-9\\.\\-]*tar.gz$" @@ -60,7 +60,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "mariadb-server, php8.2-sqlite3, php8.2-tidy, php8.2-dom, php8.2-intl, php8.2-mysql, php8.2-curl, php8.2-gd, php8.2-cli, php8.2-xml, php8.2-mbstring, php8.2-ldap" + packages = "mariadb-server, php8.3-sqlite3, php8.3-tidy, php8.3-dom, php8.3-intl, php8.3-mysql, php8.3-curl, php8.3-gd, php8.3-cli, php8.3-xml, php8.3-mbstring, php8.3-ldap" [resources.database] type = "mysql"