From ae9ed1d9d0d55cd3b06e7121fd1f50fd67e962d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 6 Apr 2023 18:39:39 +0200 Subject: [PATCH 1/7] Testing (#154) * 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 --------- Co-authored-by: yunohost-bot --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 14 ++++++++------ scripts/install | 2 +- scripts/upgrade | 2 +- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 87d9ce9..f5eb9ae 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:** 20230321~ynh2 +**Shipped version:** 20230406~ynh1 **Demo:** https://srv.tt-rss.org/tt-rss/ diff --git a/README_fr.md b/README_fr.md index eea23a6..a4db60e 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 :** 20230321~ynh2 +**Version incluse :** 20230406~ynh1 **Démo :** https://srv.tt-rss.org/tt-rss/ diff --git a/manifest.toml b/manifest.toml index d4a086f..5027e09 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 = "20230321~ynh2" +version = "20230406~ynh1" maintainers = [] @@ -40,12 +40,14 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://git-gitea.tt-rss.org/fox/tt-rss/archive/cddbf5bf5a7e2c433275a3bec089f318d4f211af.tar.gz" - sha256 = "0aedbcc2b3e34b5c015ad0668287be7069dd87e341228a4c032a29b972f89165" + url = "https://gitlab.tt-rss.org/tt-rss/tt-rss/-/archive/53bd56894dc20349fe514818e04a620c79532e87.tar.gz" + sha256 = "871ffcfc2620b10e062bd03f37326acf29872fd7850f9aa0844568ac93fa682e" - [resources.sources.data_migration] - url = "https://dev.tt-rss.org/tt-rss/ttrss-data-migration/archive/6dac32af20dc303ea2e6e03f3a9492ee3ace6a8a.tar.gz" - sha256 = "dba5638f44820393e795e8dbf5ffdafeb061913aef245ce630ddddfbc26c32c4" + #[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" [resources.system_user] diff --git a/scripts/install b/scripts/install index 96e94de..e0b7e2c 100644 --- a/scripts/install +++ b/scripts/install @@ -32,7 +32,7 @@ ynh_script_progression --message="Setting up source files..." --weight=7 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" -ynh_setup_source --dest_dir="$install_dir/plugins.local/data_migration" --source_id="data_migration" +#ynh_setup_source --dest_dir="$install_dir/plugins.local/data_migration" --source_id="data_migration" echo "$(ynh_app_upstream_version)" > "$install_dir/version_static.txt" chmod -R o-rwx "$install_dir" diff --git a/scripts/upgrade b/scripts/upgrade index 00271b7..2db9b12 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -61,7 +61,7 @@ then # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" - ynh_setup_source --dest_dir="$install_dir/plugins.local/data_migration" --source_id="data_migration" + #ynh_setup_source --dest_dir="$install_dir/plugins.local/data_migration" --source_id="data_migration" echo "$(ynh_app_upstream_version)" > "$install_dir/version_static.txt" fi From 85d57dfb8b2143cea43e388cb03de1dd663d9a12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 3 Jun 2023 14:08:05 +0200 Subject: [PATCH 2/7] Update manifest.toml --- manifest.toml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/manifest.toml b/manifest.toml index 5027e09..3192990 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.15" +yunohost = ">= 11.1.19" architectures = "all" multi_instance = true ldap = false @@ -40,8 +40,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://gitlab.tt-rss.org/tt-rss/tt-rss/-/archive/53bd56894dc20349fe514818e04a620c79532e87.tar.gz" - sha256 = "871ffcfc2620b10e062bd03f37326acf29872fd7850f9aa0844568ac93fa682e" + 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" @@ -55,19 +55,17 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" - public.url = "/public.php" public.allowed = "visitors" public.show_tile = false public.protected = true - api.url = "/api" api.allowed = "visitors" api.show_tile = false api.protected = true [resources.apt] - packages = "mariadb-server php8.0-mysql php8.0-curl php8.0-gd php8.0-opcache php8.0-fileinfo php8.0-intl php8.0-cli php8.0-mbstring php8.0-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 f15cb013dea4ec1b91272f8134a0dcfcc204117f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 3 Jun 2023 14:38:55 +0200 Subject: [PATCH 3/7] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 3192990..c4408c5 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 = "20230406~ynh1" +version = "20230603~ynh1" maintainers = [] From 0b948d9d380093fd4ecadeb222ee8745a147d976 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 3 Jun 2023 12:39:01 +0000 Subject: [PATCH 4/7] 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 f5eb9ae..e220299 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:** 20230406~ynh1 +**Shipped version:** 20230603~ynh1 **Demo:** https://srv.tt-rss.org/tt-rss/ diff --git a/README_fr.md b/README_fr.md index a4db60e..76ffdce 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 :** 20230406~ynh1 +**Version incluse :** 20230603~ynh1 **Démo :** https://srv.tt-rss.org/tt-rss/ From 71bdb4b0c63afed62b209f8f8c1647b500157766 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 3 Jun 2023 14:39:09 +0200 Subject: [PATCH 5/7] Testing (#156) * 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 --------- Co-authored-by: yunohost-bot --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 12 +++++------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index f5eb9ae..e220299 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:** 20230406~ynh1 +**Shipped version:** 20230603~ynh1 **Demo:** https://srv.tt-rss.org/tt-rss/ diff --git a/README_fr.md b/README_fr.md index a4db60e..76ffdce 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 :** 20230406~ynh1 +**Version incluse :** 20230603~ynh1 **Démo :** https://srv.tt-rss.org/tt-rss/ diff --git a/manifest.toml b/manifest.toml index 5027e09..c4408c5 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 = "20230406~ynh1" +version = "20230603~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.15" +yunohost = ">= 11.1.19" architectures = "all" multi_instance = true ldap = false @@ -40,8 +40,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://gitlab.tt-rss.org/tt-rss/tt-rss/-/archive/53bd56894dc20349fe514818e04a620c79532e87.tar.gz" - sha256 = "871ffcfc2620b10e062bd03f37326acf29872fd7850f9aa0844568ac93fa682e" + 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" @@ -55,19 +55,17 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" - public.url = "/public.php" public.allowed = "visitors" public.show_tile = false public.protected = true - api.url = "/api" api.allowed = "visitors" api.show_tile = false api.protected = true [resources.apt] - packages = "mariadb-server php8.0-mysql php8.0-curl php8.0-gd php8.0-opcache php8.0-fileinfo php8.0-intl php8.0-cli php8.0-mbstring php8.0-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 c3292275b6d164919f9cf3d43e7202508d3a0e64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 30 Jun 2023 13:49:50 +0200 Subject: [PATCH 6/7] update to upstream --- manifest.toml | 14 ++++---------- scripts/install | 7 +++++++ scripts/upgrade | 7 +++++++ 3 files changed, 18 insertions(+), 10 deletions(-) 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 6e7bebb8ad36cc4a3f8d32cfbd113f5a0e11a1a1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 30 Jun 2023 11:50:35 +0000 Subject: [PATCH 7/7] 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 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/