From c8c082c95ba3b9f339ceb1e5f10150e41e2fd899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 30 Jun 2023 14:21:15 +0200 Subject: [PATCH 1/9] Testing (#157) * Auto-update README * Upgrade to upstream * Auto-update README * Bullseye (#141) * Fix * Fix * Auto-update README Co-authored-by: yunohost-bot * Upgrade * Auto-update README * Auto-update README * Upgrade to upstream * Auto-update README * PHP * Auto-update README * Update manifest.json * Auto-update README * Update config * Fix * Auto-update README * update * Auto-update README * Version 2 (#148) * v2 * v2 * Auto-update README * Fix * Auto-update README * fix --------- Co-authored-by: yunohost-bot * Update tests.toml * Delete check_process * Update restore * Update remove * Update install * Update upgrade * Fix * Update upgrade * Update manifest.toml * Update manifest.toml * data_migration * fix * Fix * Update manifest.toml * Auto-update README * Update manifest.toml * Update manifest.toml * Auto-update README * Update tests.toml * auto updater * Update manifest.toml * Auto-update README * remove data migration * update git repo * Auto-update README * Update manifest.toml * Update manifest.toml * Auto-update README * update to upstream * Auto-update README --------- Co-authored-by: yunohost-bot --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 14 ++++---------- scripts/install | 7 +++++++ scripts/upgrade | 7 +++++++ 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index e220299..1204297 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Tiny Tiny RSS is a free and open source web-based news feed (RSS/Atom) reader an - flexible article filtering -**Shipped version:** 20230603~ynh1 +**Shipped version:** 20230630~ynh1 **Demo:** https://srv.tt-rss.org/tt-rss/ diff --git a/README_fr.md b/README_fr.md index 76ffdce..054a79b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -28,7 +28,7 @@ Tiny Tiny RSS est un lecteur et agrégateur de flux de nouvelles (RSS/Atom) bas - filtrage flexible des articles -**Version incluse :** 20230603~ynh1 +**Version incluse :** 20230630~ynh1 **Démo :** https://srv.tt-rss.org/tt-rss/ diff --git a/manifest.toml b/manifest.toml index c4408c5..43daa77 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Tiny Tiny RSS" description.en = "News feed (RSS/Atom) reader and aggregator" description.fr = "Lecteur de flux d’actualité utilisant les protocoles RSS et Atom" -version = "20230603~ynh1" +version = "20230630~ynh1" maintainers = [] @@ -17,7 +17,7 @@ admindoc = "https://tt-rss.org/wiki.php" code = "https://git-gitea.tt-rss.org/fox/tt-rss" [integration] -yunohost = ">= 11.1.19" +yunohost = ">= 11.1.21" architectures = "all" multi_instance = true ldap = false @@ -40,14 +40,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://gitlab.tt-rss.org/tt-rss/tt-rss/-/archive/d43d6f7dffef14eb026799e1ccb805b758628a80.tar.gz" - sha256 = "9a40cd82e8de3d6bdf55316e2cf9a8b300928f5c5ef2d6082898155982929baf" - - #[resources.sources.data_migration] - #url = "https://dev.tt-rss.org/tt-rss/ttrss-data-migration/archive/6dac32af20dc303ea2e6e03f3a9492ee3ace6a8a.tar.gz" - #sha256 = "dba5638f44820393e795e8dbf5ffdafeb061913aef245ce630ddddfbc26c32c4" - #autoupdate.upstream = "https://dev.tt-rss.org/tt-rss/ttrss-data-migration" - #autoupdate.strategy = "latest_github_commit" + url = "https://gitlab.tt-rss.org/tt-rss/tt-rss/-/archive/dc25a9cf6816b756cb38490eab93f02589c44a10.tar.gz" + sha256 = "e67cc86a5c0f6de72a7aa88ad4e52b1cdf2145244aa2f351b618c340f795ee75" [resources.system_user] diff --git a/scripts/install b/scripts/install index e0b7e2c..de14f56 100644 --- a/scripts/install +++ b/scripts/install @@ -38,6 +38,13 @@ echo "$(ynh_app_upstream_version)" > "$install_dir/version_static.txt" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" +#================================================= +# ALTER DATABASE +#================================================= + +ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \ + <<< "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;" + #================================================= # SYSTEM CONFIGURATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 2db9b12..356f564 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -68,6 +68,13 @@ fi chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" +#================================================= +# ALTER DATABASE +#================================================= + +ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \ + <<< "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;" + #================================================= # REAPPLY SYSTEM CONFIGURATIONS #================================================= From abb30be855b45838fb977929fff77053452e201f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 6 Sep 2023 19:00:20 +0200 Subject: [PATCH 2/9] fix --- doc/DESCRIPTION.md | 2 +- doc/DESCRIPTION_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index aa2f8d0..a53489f 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1,6 +1,6 @@ Tiny Tiny RSS is a free and open source web-based news feed (RSS/Atom) reader and aggregator. -## Features +### Features - feed aggregation/syndication, - OPML import/export, diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md index 8e4d569..8e96f81 100644 --- a/doc/DESCRIPTION_fr.md +++ b/doc/DESCRIPTION_fr.md @@ -1,6 +1,6 @@ Tiny Tiny RSS est un lecteur et agrégateur de flux de nouvelles (RSS/Atom) basé sur le web, gratuit et à code source ouvert. -## Caractéristiques +### Caractéristiques - agrégation / syndication de flux, - importation/exportation OPML, From 578764486dffdd50ed6660aa2e9f1d81142f9a35 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 6 Sep 2023 17:00:29 +0000 Subject: [PATCH 3/9] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1204297..30ad56a 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Tiny Tiny RSS is a free and open source web-based news feed (RSS/Atom) reader and aggregator. -## Features +### Features - feed aggregation/syndication, - OPML import/export, diff --git a/README_fr.md b/README_fr.md index 054a79b..c566ef3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Tiny Tiny RSS est un lecteur et agrégateur de flux de nouvelles (RSS/Atom) basé sur le web, gratuit et à code source ouvert. -## Caractéristiques +### Caractéristiques - agrégation / syndication de flux, - importation/exportation OPML, From 39a705347dbbca504c5b6c3ad778020117d709b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 9 Sep 2023 20:54:20 +0200 Subject: [PATCH 4/9] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 43daa77..2140c8d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ admindoc = "https://tt-rss.org/wiki.php" code = "https://git-gitea.tt-rss.org/fox/tt-rss" [integration] -yunohost = ">= 11.1.21" +yunohost = ">= 11.2" architectures = "all" multi_instance = true ldap = false @@ -59,7 +59,7 @@ ram.runtime = "50M" api.protected = true [resources.apt] - packages = "mariadb-server php8.2-mysql php8.2-curl php8.2-gd php8.2-opcache php8.2-fileinfo php8.2-intl php8.2-cli php8.2-mbstring php8.2-xml" + packages = "mariadb-server, php8.2-mysql, php8.2-curl, php8.2-gd, php8.2-opcache, php8.2-fileinfo, php8.2-intl, php8.2-cli, php8.2-mbstring, php8.2-xml" [resources.database] type = "mysql" From 70c93f4f378fccd8888729a733326e47efd7195e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 31 Oct 2023 14:39:16 +0000 Subject: [PATCH 5/9] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1204297..5fb0880 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Tiny Tiny RSS is a free and open source web-based news feed (RSS/Atom) reader an * Official app website: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 054a79b..217e6c3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -41,7 +41,7 @@ Tiny Tiny RSS est un lecteur et agrégateur de flux de nouvelles (RSS/Atom) bas * Site officiel de l’app : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs From 5fcd1708b94ed9dbf5fa1a012919c48ed226c59d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 11 Nov 2023 20:32:57 +0100 Subject: [PATCH 6/9] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 2e9a9c8..80350b4 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Tiny Tiny RSS" description.en = "News feed (RSS/Atom) reader and aggregator" description.fr = "Lecteur de flux d’actualité utilisant les protocoles RSS et Atom" -version = "20230630~ynh1" +version = "20231011~ynh1" maintainers = [] @@ -43,8 +43,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://gitlab.tt-rss.org/tt-rss/tt-rss/-/archive/dc25a9cf6816b756cb38490eab93f02589c44a10.tar.gz" - sha256 = "e67cc86a5c0f6de72a7aa88ad4e52b1cdf2145244aa2f351b618c340f795ee75" + url = "https://gitlab.tt-rss.org/tt-rss/tt-rss/-/archive/1fe1132a1a68bd0fedc313823b942130167fad86.tar.gz" + sha256 = "9c43a9caa714c401cf5cd397397adc51fb7df01663dda81c40d1f586c25bc012" [resources.system_user] From e517520fec767748bb73214aebc088a9a4427930 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 11 Nov 2023 19:33:02 +0000 Subject: [PATCH 7/9] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 84ccd4b..ff6389c 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Tiny Tiny RSS is a free and open source web-based news feed (RSS/Atom) reader an - flexible article filtering -**Shipped version:** 20230630~ynh1 +**Shipped version:** 20231011~ynh1 **Demo:** https://srv.tt-rss.org/tt-rss/ diff --git a/README_fr.md b/README_fr.md index fb3d451..d44facf 100644 --- a/README_fr.md +++ b/README_fr.md @@ -28,7 +28,7 @@ Tiny Tiny RSS est un lecteur et agrégateur de flux de nouvelles (RSS/Atom) bas - filtrage flexible des articles -**Version incluse :** 20230630~ynh1 +**Version incluse :** 20231011~ynh1 **Démo :** https://srv.tt-rss.org/tt-rss/ From 9755683865bd3708c9a031d6c03be53520f64ab7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 11 Nov 2023 20:37:19 +0100 Subject: [PATCH 8/9] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 80350b4..2adab14 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Tiny Tiny RSS" description.en = "News feed (RSS/Atom) reader and aggregator" description.fr = "Lecteur de flux d’actualité utilisant les protocoles RSS et Atom" -version = "20231011~ynh1" +version = "20231111~ynh1" maintainers = [] From 81be997ce04e3ba9a4b87403b7199bbb4c8a8d39 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 11 Nov 2023 19:37:29 +0000 Subject: [PATCH 9/9] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ff6389c..50a88bc 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Tiny Tiny RSS is a free and open source web-based news feed (RSS/Atom) reader an - flexible article filtering -**Shipped version:** 20231011~ynh1 +**Shipped version:** 20231111~ynh1 **Demo:** https://srv.tt-rss.org/tt-rss/ diff --git a/README_fr.md b/README_fr.md index d44facf..8e84e3c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -28,7 +28,7 @@ Tiny Tiny RSS est un lecteur et agrégateur de flux de nouvelles (RSS/Atom) bas - filtrage flexible des articles -**Version incluse :** 20231011~ynh1 +**Version incluse :** 20231111~ynh1 **Démo :** https://srv.tt-rss.org/tt-rss/