From cc39b8662d987ee7dc59429462aa796e9ee40c01 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Sun, 12 May 2024 22:39:06 +0200 Subject: [PATCH] Testing 1.23.1~ynh2 (#180) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * change autoupdate.strategy from "latest_github_tag" to "latest_github_release" * [autopatch] TEST BEFORE MERGE ynh_setup_source --full_replace=1 * bump minimal required ynh version * bump package version * backup & restore logs (#179) * cleaning * Auto-update READMEs --------- Co-authored-by: Yunohost-Bot <> Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot --- ALL_README.md | 4 +++- README.md | 4 ++-- README_es.md | 50 ++++++++++++++++++++++++++++++++++++++++++++++ README_eu.md | 50 ++++++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 50 ++++++++++++++++++++++++++++++++++++++++++++++ manifest.toml | 6 +++--- scripts/backup | 20 +------------------ scripts/change_url | 2 +- scripts/install | 4 ++-- scripts/remove | 33 ------------------------------ scripts/restore | 30 ---------------------------- scripts/upgrade | 22 ++++++-------------- 14 files changed, 170 insertions(+), 109 deletions(-) create mode 100644 README_es.md create mode 100644 README_eu.md create mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md index 3d6c579..8938aae 100644 --- 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) +- [Lee 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) -- [Leggi il “README” in italiano](README_it.md) +- [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index bedbccf..b97f4ec 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ It shall NOT be edited by hand. [![Install FreshRSS with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=freshrss) -*[Read this README is other languages.](./ALL_README.md)* +*[Read this README in other languages.](./ALL_README.md)* > *This package allows you to install FreshRSS quickly and simply on a YunoHost server.* > *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* @@ -19,7 +19,7 @@ It shall NOT be edited by hand. An efficient but powerful RSS aggregator with a nice and mobile-friendly design, as well as extension and themes support. -**Shipped version:** 1.23.1~ynh1 +**Shipped version:** 1.23.1~ynh2 **Demo:** diff --git a/README_es.md b/README_es.md new file mode 100644 index 0000000..5963406 --- /dev/null +++ b/README_es.md @@ -0,0 +1,50 @@ + + +# FreshRSS para Yunohost + +[![Nivel de integración](https://dash.yunohost.org/integration/freshrss.svg)](https://dash.yunohost.org/appci/app/freshrss) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/freshrss.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/freshrss.maintain.svg) + +[![Instalar FreshRSS con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=freshrss) + +*[Leer este README en otros idiomas.](./ALL_README.md)* + +> *Este paquete le permite instalarFreshRSS 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 + +An efficient but powerful RSS aggregator with a nice and mobile-friendly design, as well as extension and themes support. + + +**Versión actual:** 1.23.1~ynh2 + +**Demo:** + +## Capturas + +![Captura de FreshRSS](./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/freshrss_ynh/tree/testing + +Para probar la rama `testing`, sigue asÍ: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/freshrss_ynh/tree/testing --debug +o +sudo yunohost app upgrade freshrss -u https://github.com/YunoHost-Apps/freshrss_ynh/tree/testing --debug +``` + +**Mas informaciones sobre el empaquetado de aplicaciones:** diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..787c97a --- /dev/null +++ b/README_eu.md @@ -0,0 +1,50 @@ + + +# FreshRSS YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/freshrss.svg)](https://dash.yunohost.org/appci/app/freshrss) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/freshrss.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/freshrss.maintain.svg) + +[![Instalatu FreshRSS YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=freshrss) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek FreshRSS YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +An efficient but powerful RSS aggregator with a nice and mobile-friendly design, as well as extension and themes support. + + +**Paketatutako bertsioa:** 1.23.1~ynh2 + +**Demoa:** + +## Pantaila-argazkiak + +![FreshRSS(r)en pantaila-argazkia](./doc/screenshots/screenshot.png) + +## Dokumentazioa eta baliabideak + +- Aplikazioaren webgune ofiziala: +- Administratzaileen dokumentazio ofiziala: +- Jatorrizko aplikazioaren kode-gordailua: +- YunoHost Denda: +- Eman errore baten berri: + +## Garatzaileentzako informazioa + +Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/freshrss_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/freshrss_ynh/tree/testing --debug +edo +sudo yunohost app upgrade freshrss -u https://github.com/YunoHost-Apps/freshrss_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md index 6c7b229..ef9c34a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main. Agrégateur de flux RSS avec une interface adaptée au mobile. -**Version incluse :** 1.23.1~ynh1 +**Version incluse :** 1.23.1~ynh2 **Démo :** diff --git a/README_gl.md b/README_gl.md index de6f360..7f48fe4 100644 --- a/README_gl.md +++ b/README_gl.md @@ -19,7 +19,7 @@ NON debe editarse manualmente. An efficient but powerful RSS aggregator with a nice and mobile-friendly design, as well as extension and themes support. -**Versión proporcionada:** 1.23.1~ynh1 +**Versión proporcionada:** 1.23.1~ynh2 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..1da0219 --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,50 @@ + + +# YunoHost 上的 FreshRSS + +[![集成程度](https://dash.yunohost.org/integration/freshrss.svg)](https://dash.yunohost.org/appci/app/freshrss) ![工作状态](https://ci-apps.yunohost.org/ci/badges/freshrss.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/freshrss.maintain.svg) + +[![使用 YunoHost 安装 FreshRSS](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=freshrss) + +*[阅读此 README 的其它语言版本。](./ALL_README.md)* + +> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 FreshRSS。* +> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。* + +## 概况 + +An efficient but powerful RSS aggregator with a nice and mobile-friendly design, as well as extension and themes support. + + +**分发版本：** 1.23.1~ynh2 + +**演示：** + +## 截图 + +![FreshRSS 的截图](./doc/screenshots/screenshot.png) + +## 文档与资源 + +- 官方应用网站： +- 官方管理文档： +- 上游应用代码库： +- YunoHost 商店： +- 报告 bug： + +## 开发者信息 + +请向 [`testing` 分支](https://github.com/YunoHost-Apps/freshrss_ynh/tree/testing) 发送拉取请求。 + +如要尝试 `testing` 分支，请这样操作： + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/freshrss_ynh/tree/testing --debug +或 +sudo yunohost app upgrade freshrss -u https://github.com/YunoHost-Apps/freshrss_ynh/tree/testing --debug +``` + +**有关应用打包的更多信息：** diff --git a/manifest.toml b/manifest.toml index e99aedc..dab7390 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "FreshRSS" description.en = "RSS aggregator with a nice and mobile-friendly design" description.fr = "Agrégateur de flux RSS avec une interface adaptée au mobile" -version = "1.23.1~ynh1" +version = "1.23.1~ynh2" maintainers = ["plopoyop"] @@ -17,7 +17,7 @@ admindoc = "https://freshrss.github.io/FreshRSS/" code = "https://github.com/FreshRSS/FreshRSS" [integration] -yunohost = ">= 11.2" +yunohost = ">= 11.2.8" architectures = "all" multi_instance = true @@ -58,7 +58,7 @@ ram.runtime = "50M" [resources.sources.main] url = "https://github.com/FreshRSS/FreshRSS/archive/refs/tags/1.23.1.tar.gz" sha256 = "29b3dc7ebc0bc7daffebe2ed135196644d4b053df3bfcc9ee1b5c6437bc2d480" - autoupdate.strategy = "latest_github_tag" + autoupdate.strategy = "latest_github_release" [resources.system_user] diff --git a/scripts/backup b/scripts/backup index 0138445..39612b8 100755 --- a/scripts/backup +++ b/scripts/backup @@ -22,36 +22,18 @@ 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" -#================================================= -# BACKUP FAIL2BAN CONFIGURATION -#================================================= - ynh_backup --src_path="/etc/fail2ban/jail.d/$app.conf" ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf" -#================================================= -# BACKUP VARIOUS FILES -#================================================= - ynh_backup --src_path="/etc/cron.d/$app" #================================================= diff --git a/scripts/change_url b/scripts/change_url index ac1d4f7..3952683 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -23,7 +23,7 @@ ynh_change_url_nginx_config #================================================= # UPGRADING FRESHRSS #================================================= -ynh_script_progression --message="Upgrading FreshRSS..." --weight=1 +ynh_script_progression --message="Upgrading $app..." --weight=1 ynh_exec_warn_less ynh_exec_as "$app" "$install_dir/cli/reconfigure.php" --auth_type http_auth --environment production --base_url "https://$new_domain$new_path" --title FreshRSS --api_enabled --db-type mysql --db-host localhost --db-user "$db_name" --db-password "$db_pwd" --db-base "$db_name" diff --git a/scripts/install b/scripts/install index 52cd34e..47d6845 100755 --- a/scripts/install +++ b/scripts/install @@ -31,7 +31,7 @@ ynh_add_fpm_config # Create a dedicated NGINX config ynh_add_nginx_config -ynh_add_config --template="../conf/freshrss.cron" --destination="/etc/cron.d/$app" +ynh_add_config --template="freshrss.cron" --destination="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" @@ -65,7 +65,7 @@ ynh_add_fail2ban_config --logpath="/var/log/${domain}-access.log" --failregex="< #================================================= # SETUPING FRESHRSS #================================================= -ynh_script_progression --message="FreshRSS setup..." --weight=1 +ynh_script_progression --message="$app setup..." --weight=1 ynh_exec_warn_less ynh_exec_as "$app" "$install_dir/cli/do-install.php" --default_user "$admin" --auth_type http_auth --environment production --base_url "https://$domain$path" --title FreshRSS --api_enabled --db-type mysql --db-host localhost --db-user "$db_name" --db-password "$db_pwd" --db-base "$db_name" diff --git a/scripts/remove b/scripts/remove index 3ff5c07..c8cafdf 100755 --- a/scripts/remove +++ b/scripts/remove @@ -12,56 +12,23 @@ source /usr/share/yunohost/helpers #================================================= # REMOVE SYSTEM CONFIGURATIONS #================================================= -# REMOVE SYSTEMD SERVICE -#================================================= ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 -#================================================= -# REMOVE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 - # Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# REMOVE PHP CONFIGURATION -#================================================= -ynh_script_progression --message="Removing PHP configuration..." --weight=1 - # Remove the dedicated PHP-FPM config ynh_remove_fpm_config -#================================================= -# REMOVE CRON CONFIGURATION -#================================================= -ynh_script_progression --message="Removing Cron configuration..." --weight=1 - # Remove a cron file ynh_secure_remove --file="/etc/cron.d/$app" -#================================================= -# REMOVE LOG FILES -#================================================= -ynh_script_progression --message="Removing log files..." --weight=1 - # Remove the log files ynh_secure_remove --file="/var/log/$app" -#================================================= -# REMOVE LOGROTATE CONFIGURATION -#================================================= -ynh_script_progression --message="Removing logrotate configuration..." --weight=1 - # Remove the app-specific logrotate config ynh_remove_logrotate -#================================================= -# REMOVE FAIL2BAN CONFIGURATION -#================================================= - -ynh_script_progression --message="Removing fail2ban configuration..." --weight=1 - ynh_remove_fail2ban_config #================================================= diff --git a/scripts/restore b/scripts/restore index f9759a3..f39723b 100644 --- a/scripts/restore +++ b/scripts/restore @@ -30,46 +30,16 @@ ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name #================================================= # RESTORE SYSTEM CONFIGURATIONS #================================================= -# RESTORE THE PHP-FPM CONFIGURATION -#================================================= 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 configuration..." --weight=1 - ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# RESTORE THE CRON CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the Cron configuration..." --weight=1 - ynh_restore_file --origin_path="/etc/cron.d/$app" -#================================================= -# RESTORE THE LOG FILES -#================================================= -ynh_script_progression --message="Restoring the log files..." --weight=1 - -log_path="/var/log/$app" -mkdir -p "$log_path" -chown "$app":www-data "$log_path" - -#================================================= -# RESTORE THE LOGROTATE CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the logrotate configuration..." --weight=1 - ynh_restore_file --origin_path="/etc/logrotate.d/$app" -#================================================= -# RESTORE THE FAIL2BAN CONFIGURATION -#================================================= - ynh_restore_file --origin_path="/etc/fail2ban/jail.d/$app.conf" ynh_restore_file --origin_path="/etc/fail2ban/filter.d/$app.conf" ynh_systemd_action --action=restart --service_name=fail2ban diff --git a/scripts/upgrade b/scripts/upgrade index 7cb06ac..85fac19 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -40,30 +40,20 @@ then ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep="data/config.php data/users/ extensions/" + ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="data/config.php data/users/ extensions/" fi chmod -R o-rwx "$install_dir" chown -R "$app":www-data "$install_dir" #================================================= -# REAPPLY SYSTEM CONFIGURATIONS +# UPDATE A CONFIG FILE #================================================= -ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 - -#================================================= -# PHP CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading PHP configuration..." +ynh_script_progression --message="Updating $app's configuration files..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config @@ -72,7 +62,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Upgrading Cron configuration..." -ynh_add_config --template="../conf/freshrss.cron" --destination="/etc/cron.d/$app" +ynh_add_config --template="freshrss.cron" --destination="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" @@ -103,7 +93,7 @@ ynh_use_logrotate --non-append #================================================= # SETUP FAIL2BAN #================================================= -ynh_script_progression --message="Upgrading fail2ban configuration..." +ynh_script_progression --message="Upgrading Fail2Ban configuration..." # If it doesn't exist, create the logfile, required before configuring fail2ban if [ ! -f "/var/log/${domain}-access.log" ]; then @@ -118,7 +108,7 @@ ynh_add_fail2ban_config --logpath="/var/log/${domain}-access.log" --failregex="< #================================================= # UPGRADING FRESHRSS #================================================= -ynh_script_progression --message="Upgrading FreshRSS..." --weight=1 +ynh_script_progression --message="Upgrading $app..." --weight=1 # reconfigure application with latest parameters ynh_exec_warn_less ynh_exec_as "$app" "$install_dir/cli/reconfigure.php" --default_user "$admin" --auth_type http_auth --environment production --base_url "https://$domain$path" --title FreshRSS --api_enabled --db-type mysql --db-host localhost --db-user "$db_name" --db-password "$db_pwd" --db-base "$db_name"