Testing (#92)

* 22.06

* Auto-update README

* Update manifest.json

* Fix

* 22.06.1

* Auto-update README

* Update upgrade

* 22.06.2

* Auto-update README

* Update app.src

* Update DESCRIPTION.md

* Auto-update README

* Update nginx.conf

* Update .env.example.complete

* Update .env.example.complete

* Update install

* Revert "Update install"

This reverts commit e43db7a0de.

* 22.07.1 (#80)

* 22.07.1

* Auto-update README

Co-authored-by: yunohost-bot <yunohost@yunohost.org>

* Auto-update README

* Auto-update README

* 22.07.2 (#82)

* 22.07.2

* Auto-update README

Co-authored-by: yunohost-bot <yunohost@yunohost.org>

* 22.07.3 (#84)

* 22.07.3

* Auto-update README

* Update manifest.json

Co-authored-by: yunohost-bot <yunohost@yunohost.org>

* Update upgrade

* 22.09 (#88)

* 22.09

* Auto-update README

* Update app.src

Co-authored-by: yunohost-bot <yunohost@yunohost.org>

* 22.09.1

* Auto-update README

* upgrade composer

* upgrade config (#91)

* Update manifest.json

* Auto-update README

Co-authored-by: yunohost-bot <yunohost@yunohost.org>

README.md

@@ -28,8 +28,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out
 - Diagrams.net Integration
 
 
-**Shipped version:** 22.09.1~ynh1
+**Shipped version:** 22.09.1~ynh2
-
 
 **Demo:** https://demo.bookstackapp.com
 

README_fr.md

@@ -26,8 +26,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out
 - Multi-Lingual
 
 
-**Version incluse :** 22.09.1~ynh1
+**Version incluse :** 22.09.1~ynh2
-
 
 **Démo :** https://demo.bookstackapp.com
 

config_panel.toml

@@ -17,19 +17,24 @@ name = "BookStack configuration"
     name = "PHP-FPM configuration"
 
         [main.php_fpm_config.fpm_footprint]
-        ask = "Memory footprint of the service?"
+        ask = "Memory footprint"
-        choices = ["low", "medium", "high", "specific"]
+        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.<br>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.<br>medium: Low usage, few people or/and publicly accessible. Low RAM footprint, medium processor footprint when used.<br>high: High usage, frequently visited website. High RAM footprint, but lower on processor usage and quickly responding."

manifest.json

@@ -6,7 +6,7 @@
         "en": "Platform to create documentation/wiki content",
         "fr": "Plateforme pour créer du contenu de documentation/wiki"
     },
-    "version": "22.09.1~ynh1",
+    "version": "22.09.1~ynh2",
     "url": "https://www.bookstackapp.com/",
     "upstream": {
         "license": "MIT",

scripts/install

@@ -34,6 +34,9 @@ email=$(ynh_user_get_info --username=$admin --key=mail)
 app=$YNH_APP_INSTANCE_NAME
 
 auth_method="ldap"
+fpm_footprint="low"
+fpm_free_footprint=0
+fpm_usage="low"
 
 #=================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
@@ -57,6 +60,9 @@ ynh_app_setting_set --app=$app --key=language --value=$language
 ynh_app_setting_set --app=$app --key=admin --value=$admin
 ynh_app_setting_set --app=$app --key=redis_db --value=$redis_db
 ynh_app_setting_set --app=$app --key=auth_method --value=$auth_method
+ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint
+ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint
+ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage
 
 #=================================================
 # INSTALL DEPENDENCIES
@@ -106,7 +112,7 @@ ynh_add_nginx_config
 ynh_script_progression --message="Configuring PHP-FPM..." --weight=2
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=low --footprint=low
+ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================

scripts/upgrade

@@ -30,6 +30,7 @@ mail_pwd=$(ynh_string_random --length=12)
 timezone="$(cat /etc/timezone)"
 
 fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint)
+fpm_free_footprint=$(ynh_app_setting_get --app=$app --key=fpm_free_footprint)
 fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage)
 auth_method=$(ynh_app_setting_get --app=$app --key=auth_method)
 
@@ -64,6 +65,12 @@ if [ -z "$fpm_footprint" ]; then
     ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint
 fi
 
+# If fpm_free_footprint doesn't exist, create it
+if [ -z "$fpm_free_footprint" ]; then
+    fpm_free_footprint=0
+    ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint
+fi
+
 # If fpm_usage doesn't exist, create it
 if [ -z "$fpm_usage" ]; then
     fpm_usage=low