From 7c25c6b1df43348de85eede8c997eb02234329c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 23 Dec 2022 23:04:04 +0100 Subject: [PATCH 1/9] update --- manifest.json | 6 +++--- scripts/_common.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.json b/manifest.json index 4408ca2..d5b2d90 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "selfoss", "packaging_format": 1, "description": { - "en": "Multipurpose RSS reader, live stream, mashup, aggregation web application", - "fr": "Multipurpose RSS reader, live stream, mashup, aggregation web application" + "en": "Multipurpose RSS reader", + "fr": "Lecteur RSS polyvalent" }, "version": "2.18~ynh2", "url": "https://selfoss.aditu.de/", @@ -21,7 +21,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index 38c2df9..7855318 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="7.3" +YNH_PHP_VERSION="7.4" # dependencies used by the app pkg_dependencies="sqlite3 php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-curl" From 194e644dca765a8e62efe4aebaeb3b443600b543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 23 Dec 2022 23:05:58 +0100 Subject: [PATCH 2/9] 2.19 --- conf/app.src | 4 ++-- manifest.json | 2 +- scripts/_common.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/app.src b/conf/app.src index 0807a48..4a9c266 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/SSilence/selfoss/releases/download/2.18/selfoss-2.18.zip -SOURCE_SUM=0b3d46b0b25170f99e3e29c9fc6a2e5235b0449fecbdad902583c919724aa6ed +SOURCE_URL=https://github.com/SSilence/selfoss/releases/download/2.19/selfoss-2.19.zip +SOURCE_SUM=e49c4750e9723277963ca699b602f09f9148e2b9f258fce6b14429498af0e4fc SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index d5b2d90..9b182f2 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Multipurpose RSS reader", "fr": "Lecteur RSS polyvalent" }, - "version": "2.18~ynh2", + "version": "2.19~ynh1", "url": "https://selfoss.aditu.de/", "upstream": { "license": "AGPL-3.0-only", diff --git a/scripts/_common.sh b/scripts/_common.sh index 7855318..a731661 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="7.4" +YNH_PHP_VERSION="8.0" # dependencies used by the app pkg_dependencies="sqlite3 php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-curl" From 3f8e7ad0099f68259d9cf45664957562e599a2ea Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 23 Dec 2022 22:06:03 +0000 Subject: [PATCH 3/9] 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 a920583..bc4ffda 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,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.18~ynh2 +**Shipped version:** 2.19~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 8405844..80724e7 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) pour 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. -**Version incluse :** 2.18~ynh2 +**Version incluse :** 2.19~ynh1 ## Captures d'écran From 67dcb3e4c8d4e44439e6bc6dd44309498e87750f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 23 Dec 2022 23:08:29 +0100 Subject: [PATCH 4/9] Fix scripts order --- scripts/install | 16 ++++++++-------- scripts/restore | 22 +++++++++++----------- scripts/upgrade | 16 ++++++++-------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/scripts/install b/scripts/install index d804d35..1a7b3c3 100755 --- a/scripts/install +++ b/scripts/install @@ -74,14 +74,6 @@ chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" chmod g+w $final_path/data/cache $final_path/data/favicons $final_path/data/logs $final_path/data/thumbnails $final_path/data/sqlite $final_path/public -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=1 - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # PHP-FPM CONFIGURATION #================================================= @@ -90,6 +82,14 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config --usage=low --footprint=low +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Configuring NGINX web server..." --weight=1 + +# Create a dedicated NGINX config +ynh_add_nginx_config + #================================================= # ADD A CONFIGURATION #================================================= diff --git a/scripts/restore b/scripts/restore index 6e4549e..89b2aed 100755 --- a/scripts/restore +++ b/scripts/restore @@ -38,13 +38,6 @@ test ! -d $final_path || ynh_die --message="There is already a directory: $final #================================================= # STANDARD RESTORATION STEPS -#================================================= -# 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" - #================================================= # RECREATE THE DEDICATED USER #================================================= @@ -64,6 +57,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 #================================================= @@ -74,12 +75,11 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" #================================================= # SPECIFIC RESTORATION #================================================= -# REINSTALL DEPENDENCIES +# RESTORE THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Reinstalling dependencies..." --weight=1 +ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1 -# Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # RESTORE THE CRON FILE diff --git a/scripts/upgrade b/scripts/upgrade index a55e575..d72ae70 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -69,14 +69,6 @@ chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" chmod g+w $final_path/data/cache $final_path/data/favicons $final_path/data/logs $final_path/data/thumbnails $final_path/data/sqlite $final_path/public -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # UPGRADE DEPENDENCIES #================================================= @@ -92,6 +84,14 @@ 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 + #================================================= # UPDATE A CONFIG FILE #================================================= From e0cecaff907d857416d2f4ef8817d79efb5892cf Mon Sep 17 00:00:00 2001 From: Binnette Date: Sat, 24 Dec 2022 01:21:43 +0100 Subject: [PATCH 5/9] Selfoss 2.19 zip have a subfolder 'selfoss' --- conf/app.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/app.src b/conf/app.src index 4a9c266..0c8a7cf 100644 --- a/conf/app.src +++ b/conf/app.src @@ -2,5 +2,5 @@ SOURCE_URL=https://github.com/SSilence/selfoss/releases/download/2.19/selfoss-2. SOURCE_SUM=e49c4750e9723277963ca699b602f09f9148e2b9f258fce6b14429498af0e4fc SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip -SOURCE_IN_SUBDIR=false +SOURCE_IN_SUBDIR=true SOURCE_EXTRACT=true From fc340be0e89944e055ab18ee39b8bab536b9d694 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 24 Dec 2022 11:23:01 +0100 Subject: [PATCH 6/9] Update DISCLAIMER.md --- doc/DISCLAIMER.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 9ee37a2..0969cc9 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.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://your_selfoss_url.com/password` \ No newline at end of file From 974f0565679d47f023b28bb35073bb499ad67ac6 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 24 Dec 2022 10:29:49 +0000 Subject: [PATCH 7/9] 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 bc4ffda..a7334fd 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Selfoss is a multipurpose RSS reader and feed aggregation web application. It al ## Disclaimers / important information -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` +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` ## Documentation and resources * Official app website: diff --git a/README_fr.md b/README_fr.md index 80724e7..122d66f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ Selfoss is a multipurpose RSS reader and feed aggregation web application. It al ## Avertissements / informations importantes -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` +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` ## Documentations et ressources * Site officiel de l'app : From d5b49ea50d6d5bd663a3ef926c37d59b45047953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 24 Dec 2022 19:07:35 +0100 Subject: [PATCH 8/9] remove config panel --- config_panel.toml => config_panel.toml.example | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename config_panel.toml => config_panel.toml.example (100%) diff --git a/config_panel.toml b/config_panel.toml.example similarity index 100% rename from config_panel.toml rename to config_panel.toml.example From 3b3e32b86b7d04c6758b87b8ea2fa2513c056e98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 24 Dec 2022 19:09:36 +0100 Subject: [PATCH 9/9] Update config_panel.toml.example --- config_panel.toml.example | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/config_panel.toml.example b/config_panel.toml.example index 915044d..42a15a9 100644 --- a/config_panel.toml.example +++ b/config_panel.toml.example @@ -3,23 +3,28 @@ version = "1.0" [main] name = "Selfoss configuration" - [main.php_fpm_config] + [[main.php_fpm_config] name = "PHP-FPM configuration" [main.php_fpm_config.fpm_footprint] - ask = "Memory footprint of the service?" - choices = ["low", "medium", "high", "specific"] + ask = "Memory footprint" + type = "select" + choices.low = "Low, <= 20Mb per pool" + choices.medium = "Medium, between 20Mb and 40Mb per pool" + choices.high = "High, > 40Mb per pool" + choices.specific = "Use specific value" default = "low" - help = "low <= 20Mb per pool. medium between 20Mb and 40Mb per pool. high > 40Mb per pool.
Use specific to set a value with the following option." - [main.php_fpm_config.free_footprint] + [main.php_fpm_config.fpm_free_footprint] + visible = "fpm_footprint == 'specific'" ask = "Memory footprint of the service?" type = "number" default = "0" help = "Free field to specify exactly the footprint in Mb if you don't want to use one of the three previous values." [main.php_fpm_config.fpm_usage] - ask = "Expected usage of the service?" + ask = "Expected usage" + type = "select" choices = ["low", "medium", "high"] default = "low" help = "low: Personal usage, behind the SSO. No RAM footprint when not used, but the impact on the processor can be high if many users are using the service.
medium: Low usage, few people or/and publicly accessible. Low RAM footprint, medium processor footprint when used.
high: High usage, frequently visited website. High RAM footprint, but lower on processor usage and quickly responding."