From 009f956487d1580b71a2bd250418854d8e094185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 9 Jun 2022 09:31:01 +0200 Subject: [PATCH 1/4] Testing (#128) * Update manifest.json (#96) * Update manifest.json * Update manifest.json * Fix badges * Fix shasum (#99) * Add ynh_add_config (#98) * Add ynh_add_config * Add restictions * Revert "Add restictions" This reverts commit d68f41c03e71d107a0264935eab278ebdf270cde. * Update check_process * [autopatch] Update issue and PR templates (#101) Co-authored-by: Yunohost-Bot <> * Add templates * Fix files permissions * Apply example_ynh (#104) * Increment version * Upgrade config file (#108) Patches that allows to connect to the app without authentication are not working anymore. I see 3 possible solutions: - rework patches to work with upstream changes - use built-in authentication - set authentication to false and protect app access with SSO (as in this PR) * Add readme * Auto-update README * Update change_url * Update install * cleaning up * set cron * Update config.php * Update config.php * Update config.php * Update app.src * Create DISCLAIMER.md * Auto-update README * Update DISCLAIMER.md * Auto-update README * Upgrade to upstream * Auto-update README * Update config.php * Upgrade to upstream * Update manifest.json * Auto-update README * Update change_url * Update change_url * upgrade to upstream * Auto-update README * Api (#111) removing cron job. We already have update_daemon running as a service * Update manifest.json * Auto-update README * Upstream (#114) * upgrade to upstream * Auto-update README Co-authored-by: Yunohost-Bot <> * Fix upstream repo * Update check_process * Auto-update README * Update manifest.json * Upgrade from upstream * Auto-update README * Update manifest.json * Fix * Auto-update README * Update manifest.json * Auto-update README * Update remove * Update remove * Update remove * Update remove * upgrade to upstream * Auto-update README * Php8 (#129) * Auto-update README * PHP8 Co-authored-by: yunohost-bot Co-authored-by: YunoHost Bot Co-authored-by: tituspijean Co-authored-by: yalh76 Co-authored-by: Yunohost-Bot <> Co-authored-by: yunohost-bot --- README.md | 21 +++++++++++---------- README_fr.md | 27 ++++++++++++++++----------- conf/app.src | 4 ++-- manifest.json | 4 ++-- scripts/_common.sh | 4 ++-- scripts/install | 2 +- scripts/remove | 2 +- scripts/restore | 16 ++++++++-------- scripts/upgrade | 16 ++++++++-------- 9 files changed, 51 insertions(+), 45 deletions(-) diff --git a/README.md b/README.md index f2f50fa..167fecd 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # 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) +[![Integration level](https://dash.yunohost.org/integration/ttrss.svg)](https://dash.yunohost.org/appci/app/ttrss) ![Working status](https://ci-apps.yunohost.org/ci/badges/ttrss.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/ttrss.maintain.svg) [![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)* @@ -27,13 +27,13 @@ Tiny Tiny RSS is a free and open source web-based news feed (RSS/Atom) reader an - podcasts, - flexible article filtering -**Shipped version:** 20220414~ynh1 +**Shipped version:** 20220606~ynh1 **Demo:** https://demo.yunohost.org/ttrss/ ## Screenshots -![](./doc/screenshots/screenshot.png) +![Screenshot of Tiny Tiny RSS](./doc/screenshots/screenshot.png) ## Disclaimers / important information @@ -43,21 +43,22 @@ Tiny Tiny RSS is a free and open source web-based news feed (RSS/Atom) reader an - password: `password` ## Documentation and resources -* Official app website: http://tt-rss.org -* Official admin documentation: https://git.tt-rss.org/git/tt-rss/wiki -* Upstream app code repository: https://git-gitea.tt-rss.org/fox/tt-rss -* YunoHost documentation for this app: https://yunohost.org/app_ttrss -* Report a bug: https://github.com/YunoHost-Apps/ttrss_ynh/issues +* Official app website: +* Official admin documentation: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/ttrss_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/ttrss_ynh/tree/testing --debug or sudo yunohost app upgrade ttrss -u https://github.com/YunoHost-Apps/ttrss_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 18d1153..78beebe 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # Tiny Tiny RSS pour YunoHost -[![Niveau d'intégration](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) +[![Niveau d'intégration](https://dash.yunohost.org/integration/ttrss.svg)](https://dash.yunohost.org/appci/app/ttrss) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/ttrss.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/ttrss.maintain.svg) [![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)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer Tiny Tiny RSS rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* @@ -14,13 +18,13 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Tiny Tiny RSS est un lecteur et agrégateur de flux d'actualités (RSS/Atom) en ligne gratuit et open source. -**Version incluse :** 20220414~ynh1 +**Version incluse :** 20220606~ynh1 **Démo :** https://demo.yunohost.org/ttrss/ ## Captures d'écran -![](./doc/screenshots/screenshot.png) +![Capture d'écran de Tiny Tiny RSS](./doc/screenshots/screenshot.png) ## Avertissements / informations importantes @@ -30,21 +34,22 @@ Tiny Tiny RSS est un lecteur et agrégateur de flux d'actualités (RSS/Atom) en - password: `password` ## Documentations et ressources -* Site officiel de l'app : http://tt-rss.org -* Documentation officielle de l'admin : https://git.tt-rss.org/git/tt-rss/wiki -* Dépôt de code officiel de l'app : https://git-gitea.tt-rss.org/fox/tt-rss -* Documentation YunoHost pour cette app : https://yunohost.org/app_ttrss -* Signaler un bug : https://github.com/YunoHost-Apps/ttrss_ynh/issues +* Site officiel de l'app : +* Documentation officielle de l'admin : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/ttrss_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/ttrss_ynh/tree/testing --debug ou sudo yunohost app upgrade ttrss -u https://github.com/YunoHost-Apps/ttrss_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** diff --git a/conf/app.src b/conf/app.src index 804f5cf..20a0e38 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://git-gitea.tt-rss.org/fox/tt-rss/archive/2654b3c6be408113ede52180ae283afa72da5f3c.tar.gz -SOURCE_SUM=2e266d66f182d213509ec079454522b23f23da3e411de4b1f037793e97284db8 +SOURCE_URL=https://git-gitea.tt-rss.org/fox/tt-rss/archive/8ef816d8f8ee964d5ce54e28e1f2686caf9176fd.tar.gz +SOURCE_SUM=1e33e78d2ed58259b34fd7eb8d97d803a3e57aeecd3504d635af96a600b77296 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 4d71173..e419830 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": "20220414~ynh1", + "version": "20220606~ynh1", "url": "http://tt-rss.org", "upstream": { "license": "GPL-3.0-only", @@ -26,7 +26,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.3-fpm", + "php8.0-fpm", "mysql" ], "arguments": { diff --git a/scripts/_common.sh b/scripts/_common.sh index d77187a..6d0ca06 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,9 +4,9 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="7.3" +YNH_PHP_VERSION="8.0" -pkg_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 \ +pkg_dependencies="php${YNH_PHP_VERSION}-mysql 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" #================================================= diff --git a/scripts/install b/scripts/install index bf91cb3..d07cfde 100644 --- a/scripts/install +++ b/scripts/install @@ -129,7 +129,7 @@ ynh_add_systemd_config #================================================= ynh_script_progression --message="Initializing database..." --weight=6 -ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" \ +ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" \ < "$final_path/schema/ttrss_schema_mysql.sql" sudo -u $app php${phpversion} ${final_path}/update.php --update-schema=force-yes diff --git a/scripts/remove b/scripts/remove index 65fe5bc..986e6dc 100644 --- a/scripts/remove +++ b/scripts/remove @@ -53,7 +53,7 @@ ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name #================================================= # REMOVE APP MAIN DIR #================================================= -ynh_script_progression --message="Removing app main directory..." --weight=4 +ynh_script_progression --message="Removing the app main directory..." --weight=4 # Remove the app directory securely ynh_secure_remove --file="$final_path" diff --git a/scripts/restore b/scripts/restore index 7a5b057..57eccd3 100644 --- a/scripts/restore +++ b/scripts/restore @@ -66,6 +66,14 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" +#================================================= +# REINSTALL DEPENDENCIES +#================================================= +ynh_script_progression --message="Reinstalling dependencies..." --weight=1 + +# Define and install dependencies +ynh_install_app_dependencies $pkg_dependencies + #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= @@ -75,14 +83,6 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" ynh_add_fpm_config -#================================================= -# REINSTALL DEPENDENCIES -#================================================= -ynh_script_progression --message="Reinstalling dependencies..." --weight=1 - -# Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies - #================================================= # RESTORE THE MYSQL DATABASE #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index c93cb9b..186577f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -110,14 +110,6 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # UPGRADE DEPENDENCIES #================================================= @@ -133,6 +125,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config ynh_add_fpm_config +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 + +# Create a dedicated NGINX config +ynh_add_nginx_config + #================================================= # SPECIFIC UPGRADE #================================================= From f8b850cbb986eda0968655cc9f0ed6120caa7346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 10 Jun 2022 12:34:01 +0200 Subject: [PATCH 2/4] Db carset (#132) * Update config.php --- conf/config.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/config.php b/conf/config.php index 59b766f..a3c291b 100644 --- a/conf/config.php +++ b/conf/config.php @@ -11,7 +11,7 @@ putenv('TTRSS_DB_PASS=__DB_PWD__'); putenv('TTRSS_DB_PORT=3306'); // usually 5432 for PostgreSQL, 3306 for MySQL - putenv('TTRSS_MYSQL_CHARSET=UTF8'); + putenv('TTRSS_MYSQL_CHARSET=UTF8MB4'); // Connection charset for MySQL. If you have a legacy database and/or experience // garbage unicode characters with this option, try setting it to a blank string. @@ -43,7 +43,7 @@ // *** Files and directories *** // ***************************** - putenv('TTRSS_PHP_EXECUTABLE=/usr/bin/php'); + putenv('TTRSS_PHP_EXECUTABLE=/usr/bin/php__PHPVERSION__'); // Path to PHP *COMMAND LINE* executable, used for various command-line tt-rss // programs and update daemon. Do not try to use CGI binary here, it won't work. // If you see HTTP headers being displayed while running tt-rss scripts, From fadc1bd9fb7cc249f2599d68d746ec9df6d5181f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 10 Jun 2022 13:31:13 +0200 Subject: [PATCH 3/4] Update remove --- scripts/remove | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/remove b/scripts/remove index 986e6dc..7767057 100644 --- a/scripts/remove +++ b/scripts/remove @@ -88,7 +88,7 @@ ynh_remove_app_dependencies ynh_script_progression --message="Removing various files..." --weight=1 # Remove a cron file -ynh_secure_remove --file="/etc/cron.d/$app" +ynh_exec_warn_less ynh_secure_remove --file="/etc/cron.d/$app" #================================================= # GENERIC FINALIZATION From 55f54f08d9b0f9eefaa996e1689d2249ed9d630b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 16 Jun 2022 14:38:49 +0200 Subject: [PATCH 4/4] Update install --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index d07cfde..a270481 100644 --- a/scripts/install +++ b/scripts/install @@ -23,6 +23,7 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH is_public=$YNH_APP_ARG_IS_PUBLIC +phpversion=$YNH_PHP_VERSION app=$YNH_APP_INSTANCE_NAME