From a7f4f0badfb200ff950f0fc67050f2903fdaf46d Mon Sep 17 00:00:00 2001
From: Tagadda <36127788+Tagadda@users.noreply.github.com>
Date: Tue, 1 Feb 2022 23:41:35 +0000
Subject: [PATCH] fix
---
config_panel.toml | 23 ---------------
scripts/config | 73 +++++++----------------------------------------
scripts/install | 2 ++
3 files changed, 13 insertions(+), 85 deletions(-)
diff --git a/config_panel.toml b/config_panel.toml
index 858ca17..ee9f4ed 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -27,29 +27,6 @@ name = "My webapp configuration"
choices = ["none", "7.3", "7.4", "8.0"]
default = "none"
- [main.php_fpm_config.fpm_footprint]
- ask = "Memory footprint of the service?"
- type = "select"
- choices = ["low", "medium", "high", "specific"]
- default = "low"
- visible = '! match(phpversion, "none")'
- 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]
- ask = "Memory footprint of the service?"
- type = "number"
- default = "0"
- visible = 'match(fpm_footprint, "specific") && ! match(phpversion, "none")'
- 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]
- type = "select"
- ask = "Expected usage of the service?"
- choices = ["low", "medium", "high"]
- default = "low"
- visible = '! match(phpversion, "none")'
- 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."
-
# TODO: Add protected_path as tags, which are created as permission "label (path)", so admin can protect a specific path
# [main.permissions]
# [main.permissions.proteced_path]
diff --git a/scripts/config b/scripts/config
index 680c4a5..e1d0d2f 100644
--- a/scripts/config
+++ b/scripts/config
@@ -22,29 +22,6 @@ current_fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint)
# SPECIFIC GETTERS FOR TOML SHORT KEY
#=================================================
-get__fpm_footprint() {
- # Free footprint value for php-fpm
- # Check if current_fpm_footprint is an integer
- if [ "$current_fpm_footprint" -eq "$current_fpm_footprint" ] 2> /dev/null
- then
- echo "specific"
- else
- echo "$current_fpm_footprint"
- fi
-}
-
-get__free_footprint() {
- # Free footprint value for php-fpm
- # Check if current_fpm_footprint is an integer
- if [ "$current_fpm_footprint" -eq "$current_fpm_footprint" ] 2> /dev/null
- then
- # If current_fpm_footprint is an integer, that's a numeric value for the footprint
- echo "$current_fpm_footprint"
- else
- echo "0"
- fi
-}
-
#=================================================
# SPECIFIC VALIDATORS FOR TOML SHORT KEYS
#=================================================
@@ -53,20 +30,6 @@ get__free_footprint() {
# SPECIFIC SETTERS FOR TOML SHORT KEYS
#=================================================
-set__fpm_footprint() {
- if [ "$fpm_footprint" != "specific" ]
- then
- ynh_app_setting_set --app=$app --key=fpm_footprint --value="$fpm_footprint"
- fi
-}
-
-set__free_footprint() {
- if [ "$fpm_footprint" == "specific" ]
- then
- ynh_app_setting_set --app=$app --key=fpm_footprint --value="$free_footprint"
- fi
-}
-
set__password() {
if [ "$password" == "" ]
then
@@ -81,40 +44,25 @@ set__password() {
ynh_app_config_validate() {
_ynh_app_config_validate
- if [ "${changed[fpm_usage]}" == "true" ] || [ "${changed[fpm_footprint]}" == "true" ] || [ "${changed[free_footprint]}" == "true" ]; then
- # If fpm_footprint is set to 'specific', use $free_footprint value.
- if [ "$fpm_footprint" = "specific" ]
- then
- fpm_footprint=$free_footprint
- fi
-
- if [ "$fpm_footprint" == "0" ]
- then
- ynh_print_err --message="When selecting 'specific', you have to set a footprint value into the field below."
-
- exit 0
- fi
+ if [ "${changed[with_sftp]}" == "true" ] && [ $with_sftp -eq 1 ] && [ "$password" == "" ]
+ then
+ ynh_die --message="You need to set a password to enable SFTP"
fi
}
ynh_app_config_apply() {
_ynh_app_config_apply
- # If there's any change to the php config, remove the old one and add a new one if applicable
- if [ "${changed[phpversion]}" == "true" ] || "${changed[fpm_usage]}" == "true" ] || [ "${changed[fpm_footprint]}" == "true" ] || [ "${changed[free_footprint]}" == "true" ]; then
- ynh_remove_fpm_config
- if [ ! "$phpversion" == "none" ]; then
- ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint
- fi
- fi
-
- if [ ! "$phpversion" == "none" ]
+ if [ "${changed[phpversion]}" == "true" ] && [ "$phpversion" == "none" ]
then
- ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint
+ ynh_remove_fpm_config
+ elif [ "${changed[phpversion]}" == "true" ]
+ then
+ ynh_add_fpm_config --usage=low --footprint=low --phpversion=$phpversion
fi
- if [ $with_sftp -eq 1 ]
+ if [ "${changed[with_sftp]}" == "true" ] && [ $with_sftp -eq 1 ]
then
ynh_system_user_add_group --username=$app --groups="sftp.app"
@@ -122,7 +70,8 @@ ynh_app_config_apply() {
then
chpasswd <<< "${app}:${password}"
fi
- else
+ elif [ "${changed[with_sftp]}" == "true" ] && [ $with_sftp -eq 0 ]
+ then
ynh_system_user_del_group --username=$app --groups="sftp.app"
fi
}
diff --git a/scripts/install b/scripts/install
index 6644e77..5fb75d5 100644
--- a/scripts/install
+++ b/scripts/install
@@ -40,6 +40,8 @@ ynh_script_progression --message="Validating installation parameters..." --weigh
final_path=/var/www/$app
test ! -e "$final_path" || ynh_die --message="This path already contains a folder"
+[ $with_sftp -eq 0 ] || [ "$password" != "" ] || ynh_die --message="You need to set a password to enable SFTP"
+
# Register (book) web path
ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url