From b6b5fd48c96e63f9071d38f3004ab04d76db515f Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 7 Dec 2023 14:42:07 +0100 Subject: [PATCH] Testing (#164) * 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 * fix * Auto-update README * Update manifest.toml * Update manifest.toml * Auto-update README * Update manifest.toml * Auto-update README * PostgreSQL (#150) * switch to PHP * Update install * Update _common.sh * Update _common.sh * Update app.src * Update manifest.json * Auto-update README * Fix * Update remove * Update _common.sh * Update app.src * Fix * Remove cron * Update install * Update change_url * Update systemd.service * Update install * Update DESCRIPTION.md * Auto-update README * Fix * Update manifest.json * Update restore * Update app.src * Create migration * v2 * v2 * Auto-update README * Fix * Auto-update README * fix * fix * fix * Update restore * data_migration * Revert "data_migration" This reverts commit 1aea23fb527ae3dade359d4e0b553cd87d10442a. * fix * fix * Update manifest.toml * Update manifest.toml * Update manifest.toml * Auto-update README * fix * Update manifest.toml * Update manifest.toml * Auto-update README * Create PRE_UPGRADE_fr.md * fix * Auto-update README * Auto-update README * Update manifest.toml * Auto-update README --------- Co-authored-by: Yunohost-Bot <> Co-authored-by: yunohost-bot * Update manifest.toml * cleaning * Email (#162) * add email * Update config.php * Update systemd.service * Update manifest.toml * Auto-update README * Update config.php * Update config.php * Update manifest.toml * Auto-update README * Update manifest.toml * Update manifest.toml * Update systemd.service * cleaning (#165) * cleaning * Update manifest.toml * Update manifest.toml * Update manifest.toml * Auto-update README --------- Co-authored-by: yunohost-bot --- README.md | 4 ++-- README_fr.md | 4 ++-- conf/config.php | 4 ++-- conf/systemd.service | 4 +++- manifest.toml | 11 +++++++---- scripts/change_url | 2 +- scripts/install | 2 -- scripts/restore | 2 +- scripts/upgrade | 1 - 9 files changed, 18 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 420d841..ddbcd7a 100644 --- a/README.md +++ b/README.md @@ -28,9 +28,9 @@ Tiny Tiny RSS is a free and open source web-based news feed (RSS/Atom) reader an - flexible article filtering -**Shipped version:** 20231202~ynh2 +**Shipped version:** 20231202~ynh3 -**Demo:** https://srv.tt-rss.org/tt-rss/ +**Demo:** https://demo.tt-rss.org/ ## Screenshots diff --git a/README_fr.md b/README_fr.md index eb07ca1..ff74521 100644 --- a/README_fr.md +++ b/README_fr.md @@ -28,9 +28,9 @@ Tiny Tiny RSS est un lecteur et agrégateur de flux de nouvelles (RSS/Atom) bas - filtrage flexible des articles -**Version incluse :** 20231202~ynh2 +**Version incluse :** 20231202~ynh3 -**Démo :** https://srv.tt-rss.org/tt-rss/ +**Démo :** https://demo.tt-rss.org/ ## Captures d’écran diff --git a/conf/config.php b/conf/config.php index 62098ea..0ca7c28 100644 --- a/conf/config.php +++ b/conf/config.php @@ -15,7 +15,7 @@ // *** Basic settings (important!) *** // *********************************** - putenv('TTRSS_SELF_URL_PATH=__DOMAIN_PATH__'); + putenv('TTRSS_SELF_URL_PATH=https://__DOMAIN____PATH__'); // Full URL of your tt-rss installation. This should be set to the // location of tt-rss directory, e.g. http://example.org/tt-rss/ // You need to set this option correctly otherwise several features @@ -177,7 +177,7 @@ // Disabling auth_internal in this list would automatically disable // reset password link on the login form. - putenv('TTRSS_LOG_DESTINATION=sql'); + putenv('TTRSS_LOG_DESTINATION=syslog'); // Log destination to use. Possible values: sql (uses internal logging // you can read in Preferences -> System), syslog - logs to system log. // Setting this to blank uses PHP logging (usually to http server diff --git a/conf/systemd.service b/conf/systemd.service index a37e9d1..8c3091b 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -1,4 +1,6 @@ -Description=TTRSS: News feed reader and aggregator +Description=TTRSS: Backend update +Documentation=https://git.tt-rss.org/fox/tt-rss/wiki/UpdatingFeeds +Requires=network.target postgresql.service After=network.target postgresql.service [Service] diff --git a/manifest.toml b/manifest.toml index 542a5fc..b4e199f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,14 +5,14 @@ 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 = "20231202~ynh2" +version = "20231202~ynh3" maintainers = [] [upstream] license = "GPL-3.0-only" website = "https://tt-rss.org" -demo = "https://srv.tt-rss.org/tt-rss/" +demo = "https://demo.tt-rss.org/" admindoc = "https://tt-rss.org/wiki.php" code = "https://gitlab.tt-rss.org/tt-rss/tt-rss" @@ -53,17 +53,20 @@ 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.auth_header =false api.show_tile = false api.protected = true + api.allowed = "visitors" [resources.apt] - packages = "postgresql, php8.2-pgsql, 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 = "postgresql, php8.2-pgsql, 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 = "postgresql" diff --git a/scripts/change_url b/scripts/change_url index fb1351f..134002f 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -32,8 +32,8 @@ ynh_change_url_nginx_config #================================================= ynh_script_progression --message="Updating a configuration file..." --weight=1 -domain_path="https://${new_domain}${new_path}" domain="$new_domain" +path="$new_path" ynh_add_config --template="config.php" --destination="$install_dir/config.php" chmod 400 "$install_dir/config.php" diff --git a/scripts/install b/scripts/install index 9303b62..348a544 100644 --- a/scripts/install +++ b/scripts/install @@ -44,8 +44,6 @@ yunohost service add $app --description="News feed reader and aggregator" --log= #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 -domain_path=https://$domain$path - ynh_add_config --template="config.php" --destination="$install_dir/config.php" chmod 400 "$install_dir/config.php" diff --git a/scripts/restore b/scripts/restore index 811a2b0..35a82eb 100644 --- a/scripts/restore +++ b/scripts/restore @@ -30,7 +30,7 @@ ynh_psql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./d #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=50 +ynh_script_progression --message="Restoring system configurations related to $app..." --weight=5 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" diff --git a/scripts/upgrade b/scripts/upgrade index 0797a0c..3d6e3e3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -75,7 +75,6 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Updating a configuration file..." --weight=2 - domain_path=https://$domain$path ynh_add_config --template="config.php" --destination="$install_dir/config.php" ynh_script_progression --message="Upgrading the database..." --weight=2