From ce93feecd5342fe7ec551959dcea8bddaf330bc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 21 Mar 2023 19:10:36 +0100 Subject: [PATCH] Testing (#151) * 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 --------- Co-authored-by: yunohost-bot --- README.md | 2 +- README_fr.md | 2 +- conf/config.php | 2 +- manifest.toml | 8 ++++++-- scripts/install | 1 + scripts/upgrade | 4 +++- 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 31fb1ee..a357cd4 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:** 20230311~ynh1 +**Shipped version:** 20230321~ynh1 **Demo:** https://srv.tt-rss.org/tt-rss/ diff --git a/README_fr.md b/README_fr.md index 524be8f..92f1fe2 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 :** 20230311~ynh1 +**Version incluse :** 20230321~ynh1 **Démo :** https://srv.tt-rss.org/tt-rss/ diff --git a/conf/config.php b/conf/config.php index a3c291b..8098d2c 100644 --- a/conf/config.php +++ b/conf/config.php @@ -172,7 +172,7 @@ // if you experience weird errors and tt-rss failing to start, blank pages // after login, or content encoding errors, disable it. - putenv('TTRSS_PLUGINS=auth_internal, note'); + putenv('TTRSS_PLUGINS=auth_internal, note, data_migration'); // Comma-separated list of plugins to load automatically for all users. // System plugins have to be specified here. Please enable at least one // authentication plugin here (auth_*). diff --git a/manifest.toml b/manifest.toml index dd84931..b20697a 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 = "20230311~ynh1" +version = "20230321~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.14" +yunohost = ">= 11.1.15" architectures = "all" multi_instance = true ldap = false @@ -43,6 +43,10 @@ ram.runtime = "50M" url = "https://git-gitea.tt-rss.org/fox/tt-rss/archive/cddbf5bf5a7e2c433275a3bec089f318d4f211af.tar.gz" sha256 = "41df4c5902a7604acbe330f70a2fbef961338f6cf8798156de10adbc321f8e37" + [resources.sources.data_migration] + url = "https://dev.tt-rss.org/tt-rss/ttrss-data-migration/archive/6dac32af20dc303ea2e6e03f3a9492ee3ace6a8a.tar.gz" + sha256 = "dba5638f44820393e795e8dbf5ffdafeb061913aef245ce630ddddfbc26c32c4" + [resources.system_user] [resources.install_dir] diff --git a/scripts/install b/scripts/install index 1373409..96e94de 100644 --- a/scripts/install +++ b/scripts/install @@ -32,6 +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" 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 bf47995..00271b7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -61,6 +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" echo "$(ynh_app_upstream_version)" > "$install_dir/version_static.txt" fi @@ -97,7 +98,8 @@ then ynh_add_config --template="../conf/config.php" --destination="$install_dir/config.php" ynh_script_progression --message="Upgrading the database..." --weight=2 - ynh_exec_as $app php${phpversion} ${install_dir}/update.php --update-schema=force-yes + + ynh_exec_as $app php$phpversion $install_dir/update.php --update-schema=force-yes fi chmod 400 "$install_dir/config.php"