From fff2b6be3c0f6f2911831a20a5144ead35d48fd5 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 14 Jan 2022 00:26:47 +0100 Subject: [PATCH] Fix --- conf/config.yml | 6 +++--- scripts/upgrade | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/conf/config.yml b/conf/config.yml index 93218d1..7d29058 100644 --- a/conf/config.yml +++ b/conf/config.yml @@ -252,7 +252,7 @@ hsts: true ## Accepted values: true, false ## Default: true ## -registration_enabled: true +registration_enabled: __REGISTRATION_ENABLED__ ## ## Allow/Forbid users to log-in. This setting affects the ability @@ -261,7 +261,7 @@ registration_enabled: true ## Accepted values: true, false ## Default: true ## -login_enabled: true +login_enabled: __LOGIN_ENABLED__ ## ## Enable/Disable the captcha challenge on the login page. @@ -272,7 +272,7 @@ login_enabled: true ## Accepted values: true, false ## Default: true ## -captcha_enabled: true +captcha_enabled: __CAPTCHA_ENABLED__ ## ## List of usernames that will be granted administrator rights. diff --git a/scripts/upgrade b/scripts/upgrade index 996076f..46f2b30 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -25,6 +25,10 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) +registration_enabled=$(ynh_app_setting_get --app=$app --key=registration_enabled) +login_enabled=$(ynh_app_setting_get --app=$app --key=login_enabled) +captcha_enabled=$(ynh_app_setting_get --app=$app --key=captcha_enabled) + #================================================= # CHECK VERSION #================================================= @@ -59,6 +63,21 @@ ynh_systemd_action --service_name=$app --action=stop --log_path=systemd #================================================= ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 +if [ -z "$registration_enabled" ]; then + registration_enabled="true" + ynh_app_setting_set --app=$app --key=registration_enabled --value=$registration_enabled +fi + +if [ -z "$login_enabled" ]; then + login_enabled="true" + ynh_app_setting_set --app=$app --key=login_enabled --value=$login_enabled +fi + +if [ -z "$captcha_enabled" ]; then + captcha_enabled="true" + ynh_app_setting_set --app=$app --key=captcha_enabled --value=$captcha_enabled +fi + # Cleaning legacy permissions if ynh_legacy_permissions_exists; then ynh_legacy_permissions_delete_all