diff --git a/manifest.json b/manifest.json index 94b2b9a..e107bdb 100644 --- a/manifest.json +++ b/manifest.json @@ -19,7 +19,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.0-fpm" + "php7.3-fpm" ], "arguments": { "install" : [ @@ -40,7 +40,7 @@ "example": "johndoe" }, { - "name": "admin_pwd", + "name": "password", "type": "password", "ask": { "en": "Choose a password for the admin user", diff --git a/scripts/backup b/scripts/backup index 6dd5e1d..17446d9 100644 --- a/scripts/backup +++ b/scripts/backup @@ -22,7 +22,6 @@ ynh_print_info --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) admin=$(ynh_app_setting_get --app=$app --key=admin) phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) diff --git a/scripts/install b/scripts/install index 95f8a2b..aa129f9 100644 --- a/scripts/install +++ b/scripts/install @@ -25,11 +25,10 @@ app=$YNH_APP_INSTANCE_NAME # Retrieve arguments domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH -#path=$YNH_APP_ARG_PATH admin=$YNH_APP_ARG_ADMIN is_public=$YNH_APP_ARG_IS_PUBLIC login=$YNH_APP_ARG_LOGIN -admin_pwd=$YNH_APP_ARG_ADMIN_PWD +password=$YNH_APP_ARG_PASSWORD #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS @@ -37,10 +36,7 @@ admin_pwd=$YNH_APP_ARG_ADMIN_PWD ynh_script_progression --message="Validating installation parameters..." --weight=1 final_path=/var/www/$app -test ! -e "$final_path" || ynh_die "This path already contains a folder" - -# Normalize the url path syntax -path_url=$(ynh_normalize_url_path $path_url) +test ! -e "$final_path" || ynh_die --message="This path already contains a folder" # Register (book) web path ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url @@ -53,7 +49,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=admin --value=$admin -ynh_app_setting_set --app=$app --key=is_public --value=$is_public #================================================= # CREATE DEDICATED USER diff --git a/scripts/restore b/scripts/restore index ba4911b..d7259f4 100644 --- a/scripts/restore +++ b/scripts/restore @@ -24,7 +24,7 @@ ynh_script_progression --message="Loading settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get "$app" domain) -path=$(ynh_app_setting_get "$app" path) +path_url=$(ynh_app_setting_get --app=$app --key=path) admin=$(ynh_app_setting_get "$app" admin) phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) diff --git a/scripts/upgrade b/scripts/upgrade index ddd7dfe..538b3c1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -17,7 +17,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get "$app" domain) -path=$(ynh_app_setting_get "$app" path) +path_url=$(ynh_app_setting_get --app=$app --key=path) admin=$(ynh_app_setting_get "$app" admin) is_public=$(ynh_app_setting_get "$app" is_public) language=$(ynh_app_setting_get "$app" language)