From c0545e336ad4c572aff489edc8eb20cff34c7041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 17 Sep 2020 11:20:32 +0200 Subject: [PATCH 1/9] Add PHP recommended extentions (#86) - Add recommended PHP extentions : https://git.tt-rss.org/fox/tt-rss/wiki/PhpCompatibilityNotes - Upgrade to the rolling upstream version --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- scripts/_common.sh | 3 ++- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 59a5b70..33ed949 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to Tiny Tiny RSS is a free and open source web-based news feed (RSS/Atom) reader and aggregator. -**Shipped version:** 2020.09.06 +**Shipped version:** 2020.09.16 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 61c0ebc..d956c22 100644 --- a/README_fr.md +++ b/README_fr.md @@ -12,7 +12,7 @@ Si vous n’avez pas YunoHost, consultez [le guide](https://yunohost.org/#/insta Tiny Tiny RSS est un lecteur et agrégateur de flux d'actualités (RSS/Atom) en ligne gratuit et open source. -**Version incluse :** 2020.09.06 +**Version incluse :** 2020.09.16 ## Captures d’écran diff --git a/conf/app.src b/conf/app.src index 45f7630..f753d4b 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://git.tt-rss.org/fox/tt-rss/archive/67f02e2aa7b246ef7ca2b2aa4c62e2826327d219.tar.gz -SOURCE_SUM=8dc23c44d376a53a9486e54ae13d66472a8e52e597d123a17e1775ce955afe89 +SOURCE_URL=https://git.tt-rss.org/fox/tt-rss/archive/9d3c79498368fa99cfde684c759a1c40825aaaa9.tar.gz +SOURCE_SUM=a5f2aae2b566a0d06a7dd6d7d9d39695c09c77e3b4fc76ca2a49c041499b30d5 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index a6690d1..f5e2f57 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "News feed (RSS/Atom) reader and aggregator.", "fr": "Lecteur de flux d’actualité utilisant les protocoles RSS et Atom." }, - "version": "20200906~ynh2", + "version": "20200916~ynh1", "url": "http://tt-rss.org", "license": "GPL-3.0-only", "maintainer": { diff --git a/scripts/_common.sh b/scripts/_common.sh index 330d94c..3070a73 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,8 @@ YNH_PHP_VERSION="7.3" -extra_php_dependencies="php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml" +extra_php_dependencies="php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-opcache \ + php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml" #================================================= # EXPERIMENTAL HELPERS From c6a70e166cd382b14749bec5222a924805c13df5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 20 Nov 2020 12:28:18 +0100 Subject: [PATCH 2/9] Fix linter warning (#89) --- scripts/_common.sh | 2 +- scripts/install | 5 +++-- scripts/restore | 9 ++++++++- scripts/upgrade | 5 +++-- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 3070a73..f6a26c1 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -47,7 +47,7 @@ ynh_smart_mktemp () { ynh_die "Insufficient free space to continue..." fi - echo "$(sudo mktemp --directory --tmpdir="$tmpdir")" + echo "$(mktemp --directory --tmpdir="$tmpdir")" } #================================================= diff --git a/scripts/install b/scripts/install index 60d1b0c..c6bc6bf 100644 --- a/scripts/install +++ b/scripts/install @@ -90,7 +90,7 @@ ynh_system_user_create --username=$app ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies" +ynh_add_fpm_config --package="$extra_php_dependencies" phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= @@ -147,8 +147,9 @@ ynh_systemd_action --service_name=$app --action=start #================================================= # ADVERTISE SERVICE IN ADMIN PANEL #================================================= +ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app +yunohost service add $app --description "News feed reader and aggregator" #================================================= # SETUP SSOWAT diff --git a/scripts/restore b/scripts/restore index e4dde4d..74848b5 100644 --- a/scripts/restore +++ b/scripts/restore @@ -77,7 +77,7 @@ ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=50 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies" +ynh_add_fpm_config --package="$extra_php_dependencies" #================================================= # RESTORE THE MYSQL DATABASE @@ -88,6 +88,13 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) ynh_mysql_setup_db --db_user=$db_name --db_name=$db_name --db_pwd=$db_pwd ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name < ./db.sql +#================================================= +# ADVERTISE SERVICE IN ADMIN PANEL +#================================================= +ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 + +yunohost service add $app --description "News feed reader and aggregator" + #================================================= # RESTORE SYSTEMD #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index cd2626b..50385fd 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -114,7 +114,7 @@ ynh_system_user_create --username=$app ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies" +ynh_add_fpm_config --package="$extra_php_dependencies" #================================================= # SPECIFIC UPGRADE @@ -185,8 +185,9 @@ ynh_systemd_action --service_name=$app --action=restart #================================================= # ADVERTISE SERVICE IN ADMIN PANEL #================================================= +ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app +yunohost service add $app --description "News feed reader and aggregator" #================================================= # GENERIC FINALIZATION From d13f854cd2508e40bd1d5eb1ac6d7da5a05dec42 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 4 Dec 2020 14:11:53 +0100 Subject: [PATCH 3/9] Fix linter warnings --- check_process | 2 -- scripts/install | 2 +- scripts/restore | 4 ++-- scripts/upgrade | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/check_process b/check_process index 510f4c2..3d187c6 100644 --- a/check_process +++ b/check_process @@ -16,8 +16,6 @@ incorrect_path=1 port_already_use=0 change_url=1 -;;; Levels - Level 5=auto ;;; Options Email= Notification=none diff --git a/scripts/install b/scripts/install index c6bc6bf..8694927 100644 --- a/scripts/install +++ b/scripts/install @@ -149,7 +149,7 @@ ynh_systemd_action --service_name=$app --action=start #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description "News feed reader and aggregator" +yunohost service add $app --description="News feed reader and aggregator" --log="/var/log/$app/$app.log" #================================================= # SETUP SSOWAT diff --git a/scripts/restore b/scripts/restore index 74848b5..fc027a8 100644 --- a/scripts/restore +++ b/scripts/restore @@ -93,7 +93,7 @@ ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name < ./ #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description "News feed reader and aggregator" +yunohost service add $app --description="News feed reader and aggregator" --log="/var/log/$app/$app.log" #================================================= # RESTORE SYSTEMD @@ -101,7 +101,7 @@ yunohost service add $app --description "News feed reader and aggregator" ynh_script_progression --message="Restoring the systemd configuration..." --weight=2 ynh_restore_file --origin_path="/etc/systemd/system/$app.service" -systemctl enable $app.service +systemctl enable $app.service --quiet ynh_systemd_action --service_name=$app --action=start #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 50385fd..df257fe 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -187,7 +187,7 @@ ynh_systemd_action --service_name=$app --action=restart #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description "News feed reader and aggregator" +yunohost service add $app --description="News feed reader and aggregator" --log="/var/log/$app/$app.log" #================================================= # GENERIC FINALIZATION From cd08ebfeeba7238aea8f02ee5239c291981ee77e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 10 Dec 2020 21:00:39 +0100 Subject: [PATCH 4/9] Fix linter warnings --- scripts/install | 3 --- scripts/restore | 2 +- scripts/upgrade | 7 ------- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/scripts/install b/scripts/install index 8694927..351f730 100644 --- a/scripts/install +++ b/scripts/install @@ -33,9 +33,6 @@ ynh_script_progression --message="Validating installation parameters..." --weigh final_path=/var/www/$app test ! -e "$final_path" || ynh_die "This path already contains a folder" -# Normalize the url path syntax -path_url=$(ynh_normalize_url_path $path_url) - # Register (book) web path ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url diff --git a/scripts/restore b/scripts/restore index fc027a8..a8477e0 100644 --- a/scripts/restore +++ b/scripts/restore @@ -98,7 +98,7 @@ yunohost service add $app --description="News feed reader and aggregator" --log= #================================================= # RESTORE SYSTEMD #================================================= -ynh_script_progression --message="Restoring the systemd configuration..." --weight=2 +ynh_script_progression --message="Restoring the systemd configuration..." --weight=2 ynh_restore_file --origin_path="/etc/systemd/system/$app.service" systemctl enable $app.service --quiet diff --git a/scripts/upgrade b/scripts/upgrade index df257fe..9a01a43 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -68,13 +68,6 @@ ynh_abort_if_errors # Remove old cron job ynh_secure_remove --file="/etc/cron.d/$app" -#================================================= -# CHECK THE PATH -#================================================= - -# Normalize the URL path syntax -path_url=$(ynh_normalize_url_path --path_url=$path_url) - #================================================= # STANDARD UPGRADE STEPS #================================================= From 39854cb8e2b2581b4f84950e7aaea1181f82847f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 13 Dec 2020 10:10:10 +0100 Subject: [PATCH 5/9] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index f5e2f57..dd1f625 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "News feed (RSS/Atom) reader and aggregator.", "fr": "Lecteur de flux d’actualité utilisant les protocoles RSS et Atom." }, - "version": "20200916~ynh1", + "version": "20200916~ynh2", "url": "http://tt-rss.org", "license": "GPL-3.0-only", "maintainer": { From 24aee244a1c1a42fde1ad922147fa13921175ce2 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 13 Dec 2020 10:11:33 +0100 Subject: [PATCH 6/9] Update check_process --- check_process | 1 - 1 file changed, 1 deletion(-) diff --git a/check_process b/check_process index 3d187c6..55c91c9 100644 --- a/check_process +++ b/check_process @@ -13,7 +13,6 @@ upgrade=1 from_commit=e27175c2dde0ebbd483b212dc76c5b27877e4ed2 backup_restore=1 multi_instance=1 - incorrect_path=1 port_already_use=0 change_url=1 ;;; Options From 555cd587ceaf13216599ebb4a6c9abeee52f51aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 26 Dec 2020 23:11:34 +0100 Subject: [PATCH 7/9] Set SVG badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 33ed949..452cbe7 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Tiny Tiny RSS for YunoHost [![Integration level](https://dash.yunohost.org/integration/ttrss.svg)](https://dash.yunohost.org/appci/app/ttrss) ![](https://ci-apps.yunohost.org/ci/badges/ttrss.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/ttrss.maintain.svg) -[![Install Tiny Tiny RSS with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=ttrss) +[![Install Tiny Tiny RSS with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=ttrss) *[Lire ce readme en français.](./README_fr.md)* From b8354effe3ba4a8f2af821e098c45fc1cbad8934 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 26 Dec 2020 23:11:52 +0100 Subject: [PATCH 8/9] Set SVG badge --- README_fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_fr.md b/README_fr.md index d956c22..f0285a8 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,7 @@ # Tiny Tiny RSS pour YunoHost [![Integration level](https://dash.yunohost.org/integration/ttrss.svg)](https://dash.yunohost.org/appci/app/ttrss) ![](https://ci-apps.yunohost.org/ci/badges/ttrss.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/ttrss.maintain.svg) -[![Installer Tiny Tiny RSS avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=ttrss) +[![Installer Tiny Tiny RSS avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=ttrss) *[Read this readme in english.](./README.md)* From 6501b6f9ccda86cae3e3e16e1d7ba85e7ff7e3f5 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 14 Mar 2021 22:09:46 +0100 Subject: [PATCH 9/9] Update manifest.json --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index dd1f625..83a2fa2 100644 --- a/manifest.json +++ b/manifest.json @@ -10,8 +10,8 @@ "url": "http://tt-rss.org", "license": "GPL-3.0-only", "maintainer": { - "name": "YunoHost Contributors", - "email": "apps@yunohost.org" + "name": "", + "email": "" }, "requirements": { "yunohost": ">= 3.8.1"