From 5212ac0db71e4184e46f37ef45b901d2b19aad75 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Thu, 21 Mar 2024 01:21:37 +0100 Subject: [PATCH 01/11] change autoupdate.strategy from "latest_github_tag" to "latest_github_release" --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index e99aedc..f969e48 100644 --- a/manifest.toml +++ b/manifest.toml @@ -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] From 86c9f567448f3b0ba2addf070ac8d3ad45d49d24 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 11 Mar 2024 16:04:42 +0100 Subject: [PATCH 02/11] [autopatch] TEST BEFORE MERGE ynh_setup_source --full_replace=1 --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 7cb06ac..28b8b95 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -40,7 +40,7 @@ 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" From 17e2d142dd062417aaa09a7319e912afb5839921 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Thu, 21 Mar 2024 01:23:36 +0100 Subject: [PATCH 03/11] bump minimal required ynh version --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index f969e48..c3e0570 100644 --- a/manifest.toml +++ b/manifest.toml @@ -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 From f3c17dd9ec01fc47bdd5fbb43ff0b846538a7c60 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Thu, 21 Mar 2024 01:36:07 +0100 Subject: [PATCH 04/11] bump package version --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index c3e0570..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"] From e7b30b8fd017983b109d35f1a075cafe1b35329d Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Thu, 21 Mar 2024 04:34:55 +0100 Subject: [PATCH 05/11] backup & restore logs (#179) --- scripts/backup | 6 ++++++ scripts/restore | 20 +++++++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/scripts/backup b/scripts/backup index 0138445..9afc156 100755 --- a/scripts/backup +++ b/scripts/backup @@ -33,6 +33,12 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" +#================================================= +# BACKUP LOGS +#================================================= + +ynh_backup --src_path="/var/log/nginx/$domain-access.log" + #================================================= # SPECIFIC BACKUP #================================================= diff --git a/scripts/restore b/scripts/restore index f9759a3..7df2611 100644 --- a/scripts/restore +++ b/scripts/restore @@ -36,6 +36,17 @@ ynh_script_progression --message="Restoring system configurations related to $ap ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" +#================================================= +# RESTORE LOGS +#================================================= +ynh_script_progression --message="Restoring the log files..." --weight=1 + +ynh_restore_file --origin_path="/var/log/nginx/$domain-access.log" + +log_path="/var/log/$app" +mkdir -p "$log_path" +chown "$app":www-data "$log_path" + #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= @@ -50,15 +61,6 @@ ynh_script_progression --message="Restoring the Cron configuration..." --weight= 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 #================================================= From a6707aa7d46ae19b58bc0a3fda48256260d2703f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 12 May 2024 17:39:01 +0200 Subject: [PATCH 06/11] cleaning --- scripts/backup | 26 +------------------------- scripts/change_url | 2 +- scripts/install | 4 ++-- scripts/remove | 33 --------------------------------- scripts/restore | 32 -------------------------------- scripts/upgrade | 20 +++++--------------- 6 files changed, 9 insertions(+), 108 deletions(-) diff --git a/scripts/backup b/scripts/backup index 9afc156..39612b8 100755 --- a/scripts/backup +++ b/scripts/backup @@ -22,42 +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" -#================================================= -# BACKUP LOGS -#================================================= - -ynh_backup --src_path="/var/log/nginx/$domain-access.log" - -#================================================= -# 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 7df2611..f39723b 100644 --- a/scripts/restore +++ b/scripts/restore @@ -30,48 +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 LOGS -#================================================= -ynh_script_progression --message="Restoring the log files..." --weight=1 - -ynh_restore_file --origin_path="/var/log/nginx/$domain-access.log" - -log_path="/var/log/$app" -mkdir -p "$log_path" -chown "$app":www-data "$log_path" - -#================================================= -# 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 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 28b8b95..85fac19 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -47,23 +47,13 @@ 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" From fa513a33d1dd9564f15ca73696bb094be81dd74c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 12 May 2024 15:39:06 +0000 Subject: [PATCH 07/11] Auto-update READMEs --- ALL_README.md | 8 ++++++++ README.md | 28 +++++++++++++------------- README_es.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++ README_eu.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 32 +++++++++++++++--------------- README_gl.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 238 insertions(+), 30 deletions(-) create mode 100644 ALL_README.md create mode 100644 README_es.md create mode 100644 README_eu.md create mode 100644 README_gl.md create mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md new file mode 100644 index 0000000..8938aae --- /dev/null +++ b/ALL_README.md @@ -0,0 +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) +- [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index 0a82250..b97f4ec 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -9,19 +9,19 @@ 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) -*[Lire ce readme en français.](./README_fr.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.* +> *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.* ## Overview 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:** https://demo.freshrss.org +**Demo:** ## Screenshots @@ -29,19 +29,19 @@ An efficient but powerful RSS aggregator with a nice and mobile-friendly design, ## Documentation and resources -* Official app website: -* Official admin documentation: -* Upstream app code repository: -* YunoHost Store: -* Report a bug: +- Official app website: +- Official admin documentation: +- Upstream app code repository: +- YunoHost Store: +- Report a bug: ## Developer info -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/freshrss_ynh/tree/testing). +Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/freshrss_ynh/tree/testing). -To try the testing branch, please proceed like that. +To try the `testing` branch, please proceed like that: -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/freshrss_ynh/tree/testing --debug or sudo yunohost app upgrade freshrss -u https://github.com/YunoHost-Apps/freshrss_ynh/tree/testing --debug 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 a2011b2..ef9c34a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +1,6 @@ # FreshRSS pour YunoHost @@ -9,19 +9,19 @@ It shall NOT be edited by hand. [![Installer FreshRSS avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=freshrss) -*[Read this readme in english.](./README.md)* +*[Lire le README dans d'autres langues.](./ALL_README.md)* -> *Ce package vous permet d’installer FreshRSS rapidement et simplement sur un serveur YunoHost. -Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* +> *Ce package vous permet d’installer FreshRSS rapidement et simplement sur un serveur YunoHost.* +> *Si vous n’avez pas YunoHost, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.* ## Vue d’ensemble 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 :** https://demo.freshrss.org +**Démo :** ## Captures d’écran @@ -29,22 +29,22 @@ Agrégateur de flux RSS avec une interface adaptée au mobile. ## Documentations et ressources -* Site officiel de l’app : -* Documentation officielle de l’admin : -* Dépôt de code officiel de l’app : -* YunoHost Store: -* Signaler un bug : +- Site officiel de l’app : +- Documentation officielle de l’admin : +- Dépôt de code officiel de l’app : +- YunoHost Store : +- Signaler un bug : ## Informations pour les développeurs -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/freshrss_ynh/tree/testing). +Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/freshrss_ynh/tree/testing). -Pour essayer la branche testing, procédez comme suit. +Pour essayer la branche `testing`, procédez comme suit : -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/freshrss_ynh/tree/testing --debug ou sudo yunohost app upgrade freshrss -u https://github.com/YunoHost-Apps/freshrss_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** \ No newline at end of file +**Plus d’infos sur le packaging d’applications :** diff --git a/README_gl.md b/README_gl.md new file mode 100644 index 0000000..7f48fe4 --- /dev/null +++ b/README_gl.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 de funcionamento](https://ci-apps.yunohost.org/ci/badges/freshrss.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/freshrss.maintain.svg) + +[![Instalar FreshRSS con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=freshrss) + +*[Le este README en outros idiomas.](./ALL_README.md)* + +> *Este paquete permíteche instalar FreshRSS de xeito rápido e doado nun servidor YunoHost.* +> *Se non usas YunoHost, le a [documentación](https://yunohost.org/install) para saber como instalalo.* + +## Vista xeral + +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~ynh2 + +**Demo:** + +## Capturas de pantalla + +![Captura de pantalla de FreshRSS](./doc/screenshots/screenshot.png) + +## Documentación e recursos + +- Web oficial da app: +- Documentación oficial para admin: +- Repositorio de orixe do código: +- Tenda YunoHost: +- Informar dun problema: + +## Info de desenvolvemento + +Envía a túa colaboración á [rama `testing`](https://github.com/YunoHost-Apps/freshrss_ynh/tree/testing). + +Para probar a rama `testing`, procede deste xeito: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/freshrss_ynh/tree/testing --debug +ou +sudo yunohost app upgrade freshrss -u https://github.com/YunoHost-Apps/freshrss_ynh/tree/testing --debug +``` + +**Máis info sobre o empaquetado da app:** 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 +``` + +**有关应用打包的更多信息：** From e41a991bcf3af3d473c6c13fc6b651ebc5bccb3c Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Sat, 25 May 2024 23:09:50 +0200 Subject: [PATCH 08/11] Upgrade to v1.24.0 (#181) * Upgrade to v1.24.0 https://github.com/FreshRSS/FreshRSS/releases/tag/1.24.0 * Auto-update READMEs --- ALL_README.md | 2 +- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- manifest.toml | 6 +++--- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ALL_README.md b/ALL_README.md index 8938aae..152f2e7 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,7 +1,7 @@ # All available README files by language - [Read the README in English](README.md) -- [Lee el README en español](README_es.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.md b/README.md index b97f4ec..b521029 100644 --- a/README.md +++ b/README.md @@ -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~ynh2 +**Shipped version:** 1.24.0~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index 5963406..096118d 100644 --- a/README_es.md +++ b/README_es.md @@ -19,7 +19,7 @@ No se debe editar a mano. 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 +**Versión actual:** 1.24.0~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index 787c97a..570f3d5 100644 --- a/README_eu.md +++ b/README_eu.md @@ -19,7 +19,7 @@ EZ editatu eskuz. 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 +**Paketatutako bertsioa:** 1.24.0~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index ef9c34a..136ed2d 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~ynh2 +**Version incluse :** 1.24.0~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 7f48fe4..7e0c88b 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~ynh2 +**Versión proporcionada:** 1.24.0~ynh1 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 1da0219..134a6f2 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -19,7 +19,7 @@ An efficient but powerful RSS aggregator with a nice and mobile-friendly design, as well as extension and themes support. -**分发版本：** 1.23.1~ynh2 +**分发版本：** 1.24.0~ynh1 **演示：** diff --git a/manifest.toml b/manifest.toml index dab7390..01fbffb 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~ynh2" +version = "1.24.0~ynh1" maintainers = ["plopoyop"] @@ -56,8 +56,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/FreshRSS/FreshRSS/archive/refs/tags/1.23.1.tar.gz" - sha256 = "29b3dc7ebc0bc7daffebe2ed135196644d4b053df3bfcc9ee1b5c6437bc2d480" + url = "https://github.com/FreshRSS/FreshRSS/archive/refs/tags/1.24.0.tar.gz" + sha256 = "114d92696070077a506c535bf549ed9e7b0ef2250a74a1b95ae0c6df38c774f5" autoupdate.strategy = "latest_github_release" [resources.system_user] From 35ced7c0122b7f8e50091c65094d8d1b4fa741e6 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 5 Jun 2024 20:42:44 +0200 Subject: [PATCH 09/11] Update upgrade (#184) --- scripts/upgrade | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 85fac19..517547d 100755 --- 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) - #================================================= # STANDARD UPGRADE STEPS #================================================= @@ -34,14 +28,10 @@ fi #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." --weight=1 -if [ "$upgrade_type" == "UPGRADE_APP" ] -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" --full_replace=1 --keep="data/config.php data/users/ extensions/" -fi +# 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/" #--full_replace=1 chmod -R o-rwx "$install_dir" chown -R "$app":www-data "$install_dir" From ddb4a920fcb3b70de054dffaa3b92e0bc338d9e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 5 Jun 2024 20:45:29 +0200 Subject: [PATCH 10/11] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 01fbffb..3dc4834 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.24.0~ynh1" +version = "1.24.1~ynh1" maintainers = ["plopoyop"] @@ -56,8 +56,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/FreshRSS/FreshRSS/archive/refs/tags/1.24.0.tar.gz" - sha256 = "114d92696070077a506c535bf549ed9e7b0ef2250a74a1b95ae0c6df38c774f5" + url = "https://github.com/FreshRSS/FreshRSS/archive/refs/tags/1.24.1.tar.gz" + sha256 = "a89b8324204f99746225ee73878af8697814d83d250e0f0957dad8053baee088" autoupdate.strategy = "latest_github_release" [resources.system_user] From 51055995a9da2c026e5ff16d1b920f0c8d2403ff Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 5 Jun 2024 18:45:34 +0000 Subject: [PATCH 11/11] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b521029..a12cf79 100644 --- a/README.md +++ b/README.md @@ -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.24.0~ynh1 +**Shipped version:** 1.24.1~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index 096118d..27f1597 100644 --- a/README_es.md +++ b/README_es.md @@ -19,7 +19,7 @@ No se debe editar a mano. An efficient but powerful RSS aggregator with a nice and mobile-friendly design, as well as extension and themes support. -**Versión actual:** 1.24.0~ynh1 +**Versión actual:** 1.24.1~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index 570f3d5..46f4cca 100644 --- a/README_eu.md +++ b/README_eu.md @@ -19,7 +19,7 @@ EZ editatu eskuz. An efficient but powerful RSS aggregator with a nice and mobile-friendly design, as well as extension and themes support. -**Paketatutako bertsioa:** 1.24.0~ynh1 +**Paketatutako bertsioa:** 1.24.1~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 136ed2d..960359c 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.24.0~ynh1 +**Version incluse :** 1.24.1~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 7e0c88b..c6d8172 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.24.0~ynh1 +**Versión proporcionada:** 1.24.1~ynh1 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 134a6f2..2eb23fa 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -19,7 +19,7 @@ An efficient but powerful RSS aggregator with a nice and mobile-friendly design, as well as extension and themes support. -**分发版本：** 1.24.0~ynh1 +**分发版本：** 1.24.1~ynh1 **演示：**