diff --git a/README.md b/README.md
index a920583..a7334fd 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
@@ -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 8405844..122d66f 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
@@ -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 :
diff --git a/conf/app.src b/conf/app.src
index 0807a48..0c8a7cf 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,6 +1,6 @@
-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
+SOURCE_IN_SUBDIR=true
SOURCE_EXTRACT=true
diff --git a/config_panel.toml b/config_panel.toml.example
similarity index 66%
rename from config_panel.toml
rename to config_panel.toml.example
index 915044d..42a15a9 100644
--- a/config_panel.toml
+++ 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."
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
diff --git a/manifest.json b/manifest.json
index 4408ca2..9b182f2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,10 +3,10 @@
"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",
+ "version": "2.19~ynh1",
"url": "https://selfoss.aditu.de/",
"upstream": {
"license": "AGPL-3.0-only",
@@ -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..a731661 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,7 +4,7 @@
# COMMON VARIABLES
#=================================================
-YNH_PHP_VERSION="7.3"
+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"
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
#=================================================