From a1ada7ee2653f90045a6bbf9b8cd4843ee4cb150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 27 Mar 2023 18:51:28 +0200 Subject: [PATCH 1/5] cleaning --- doc/ADMIN.md | 2 +- manifest.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index 2f1e556..d31c99c 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -1 +1 @@ -password hash for optional login. You can generate a password hash by using following page of your Selfoss installation. `http://__DOMAIN__/password` \ No newline at end of file +password hash for optional login. You can generate a password hash by using following page of your Selfoss installation. `https://__DOMAIN__/password` \ No newline at end of file diff --git a/manifest.toml b/manifest.toml index 665c901..ebb5e45 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ description.fr = "Lecteur RSS polyvalent" version = "2.19~ynh1" -maintainers = [] +maintainers = ["eric_G"] [upstream] license = "AGPL-3.0-only" @@ -17,7 +17,7 @@ userdoc = "https://selfoss.aditu.de/" code = "https://github.com/fossar/selfoss" [integration] -yunohost = ">= 11.1.14" +yunohost = ">= 11.1.15" architectures = "all" multi_instance = true ldap = false From c3f7d5f6d84691601cf36a140be86a0214661d0f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 9 Sep 2023 08:25:55 +0200 Subject: [PATCH 2/5] cleaning --- doc/ADMIN.md | 2 +- doc/ADMIN_fr.md | 1 + doc/DESCRIPTION_fr.md | 1 + doc/POST_INSTALL.md | 2 +- manifest.toml | 5 +++-- scripts/install | 5 ----- scripts/remove | 12 ------------ scripts/restore | 12 ------------ scripts/upgrade | 5 ----- 9 files changed, 7 insertions(+), 38 deletions(-) create mode 100644 doc/ADMIN_fr.md create mode 100644 doc/DESCRIPTION_fr.md diff --git a/doc/ADMIN.md b/doc/ADMIN.md index d31c99c..dfbaf68 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -1 +1 @@ -password hash for optional login. You can generate a password hash by using following page of your Selfoss installation. `https://__DOMAIN__/password` \ No newline at end of file +password hash for optional login. You can generate a password hash by using following page of your Selfoss installation. `https://__DOMAIN____PATH__/password` diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md new file mode 100644 index 0000000..f6bd5d0 --- /dev/null +++ b/doc/ADMIN_fr.md @@ -0,0 +1 @@ +hachage de mot de passe pour une connexion facultative. Vous pouvez générer un hachage de mot de passe en utilisant la page suivante de votre installation Selfoss. `https://__DOMAIN____PATH__/mot de passe` \ No newline at end of file diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..7b484b4 --- /dev/null +++ b/doc/DESCRIPTION_fr.md @@ -0,0 +1 @@ +Selfoss est un lecteur RSS polyvalent et une application Web d'agrégation de flux. Il vous permet de suivre facilement les mises à jour de différents sites Web, réseaux sociaux et autres plateformes, le tout en un seul endroit. Il est écrit en PHP, ce qui vous permet de l'exécuter pratiquement n'importe où. \ No newline at end of file diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md index 0969cc9..2f1e556 100644 --- a/doc/POST_INSTALL.md +++ b/doc/POST_INSTALL.md @@ -1 +1 @@ -password hash for optional login. You can generate a password hash by using following page of your Selfoss installation. `http://your_selfoss_url.com/password` \ No newline at end of file +password hash for optional login. You can generate a password hash by using following page of your Selfoss installation. `http://__DOMAIN__/password` \ No newline at end of file diff --git a/manifest.toml b/manifest.toml index ebb5e45..f69feea 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ userdoc = "https://selfoss.aditu.de/" code = "https://github.com/fossar/selfoss" [integration] -yunohost = ">= 11.1.15" +yunohost = ">= 11.2" architectures = "all" multi_instance = true ldap = false @@ -42,6 +42,7 @@ ram.runtime = "50M" [resources.sources.main] url = "https://github.com/SSilence/selfoss/releases/download/2.19/selfoss-2.19.zip" sha256 = "e49c4750e9723277963ca699b602f09f9148e2b9f258fce6b14429498af0e4fc" + autoupdate.strategy = "latest_github_tag" [resources.system_user] @@ -51,4 +52,4 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "sqlite3 php8.0-xml php8.0-sqlite3 php8.0-mbstring php8.0-mysql php8.0-gd php8.0-curl" + packages = "sqlite3, php8.2-xml, php8.2-sqlite3, php8.2-mbstring, php8.2-mysql, php8.2-gd, php8.2-curl" diff --git a/scripts/install b/scripts/install index c09d8c0..ec9b1a1 100755 --- a/scripts/install +++ b/scripts/install @@ -41,11 +41,6 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=1 - # Create a dedicated NGINX config ynh_add_nginx_config diff --git a/scripts/remove b/scripts/remove index 3242cce..a18a484 100755 --- a/scripts/remove +++ b/scripts/remove @@ -17,21 +17,9 @@ ynh_script_progression --message="Removing NGINX web server configuration..." -- # Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# REMOVE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1 - # Remove the dedicated PHP-FPM config ynh_remove_fpm_config -#================================================= -# SPECIFIC REMOVE -#================================================= -# REMOVE VARIOUS FILES -#================================================= -ynh_script_progression --message="Removing various files..." --weight=1 - # Remove a cron file ynh_secure_remove --file="/etc/cron.d/$app" diff --git a/scripts/restore b/scripts/restore index 3a1922a..db0b68c 100755 --- a/scripts/restore +++ b/scripts/restore @@ -27,20 +27,8 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -#================================================= -# SPECIFIC RESTORATION -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1 - ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# RESTORE THE CRON FILE -#================================================= -ynh_script_progression --message="Restoring the cron file..." --weight=1 - ynh_restore_file --origin_path="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" diff --git a/scripts/upgrade b/scripts/upgrade index 3314647..f21374d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -62,11 +62,6 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 - # Create a dedicated NGINX config ynh_add_nginx_config From f6a20b0f8258bf03806b0a998a91a91bdc509633 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 9 Sep 2023 06:26:00 +0000 Subject: [PATCH 3/5] Auto-update README --- README_fr.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README_fr.md b/README_fr.md index a2be9e7..230429e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,8 +16,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble -Selfoss is a multipurpose RSS reader and feed aggregation web application. It allows you to easily follow updates from different web sites, social networks and other platforms, all in single place. It is written in PHP, allowing you to run it basically anywhere. - +Selfoss est un lecteur RSS polyvalent et une application Web d'agrégation de flux. Il vous permet de suivre facilement les mises à jour de différents sites Web, réseaux sociaux et autres plateformes, le tout en un seul endroit. Il est écrit en PHP, ce qui vous permet de l'exécuter pratiquement n'importe où. **Version incluse :** 2.19~ynh1 From 090ba0fd769bfd89295e5aad2d5d8f8d02c1d839 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 9 Sep 2023 08:26:52 +0200 Subject: [PATCH 4/5] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index f69feea..95e4fa8 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Selfoss" description.en = "Multipurpose RSS reader" description.fr = "Lecteur RSS polyvalent" -version = "2.19~ynh1" +version = "2.19~ynh2" maintainers = ["eric_G"] From 4f7b8b9b82cd0cd1200c0907e6b5d249a2ebc9b9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 9 Sep 2023 06:27:05 +0000 Subject: [PATCH 5/5] 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 51382cd..73a1445 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Selfoss is a multipurpose RSS reader and feed aggregation web application. It allows you to easily follow updates from different web sites, social networks and other platforms, all in single place. It is written in PHP, allowing you to run it basically anywhere. -**Shipped version:** 2.19~ynh1 +**Shipped version:** 2.19~ynh2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 230429e..37c42fc 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Selfoss est un lecteur RSS polyvalent et une application Web d'agrégation de flux. Il vous permet de suivre facilement les mises à jour de différents sites Web, réseaux sociaux et autres plateformes, le tout en un seul endroit. Il est écrit en PHP, ce qui vous permet de l'exécuter pratiquement n'importe où. -**Version incluse :** 2.19~ynh1 +**Version incluse :** 2.19~ynh2 ## Captures d’écran