diff options
| author | yalh76 <yalh@yahoo.com> | 2019-03-23 02:28:48 +0100 |
|---|---|---|
| committer | yalh76 <yalh@yahoo.com> | 2019-03-23 02:28:48 +0100 |
| commit | 652d6f6c67c200fc22bf03efed0174ebc4f38d29 (patch) | |
| tree | d13bf9872c70d4340ec4938c6ed9434f907663eb /scripts/upgrade | |
| parent | ff2fea8ef2b45cb027a72b8a3b124dd401f6a159 (diff) | |
| download | mastodon_ynh-652d6f6c67c200fc22bf03efed0174ebc4f38d29.tar.gz mastodon_ynh-652d6f6c67c200fc22bf03efed0174ebc4f38d29.tar.bz2 mastodon_ynh-652d6f6c67c200fc22bf03efed0174ebc4f38d29.zip | |
fix ldap user
Diffstat (limited to 'scripts/upgrade')
| -rw-r--r-- | scripts/upgrade | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/scripts/upgrade b/scripts/upgrade index 0e0b84d..fbe9ec7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -89,9 +89,10 @@ fi # If ldap_password doesn't exist, retrieve it or create it if [[ -z "$ldap_user" ]]; then - ynh_user_exists $ldap_user || ynh_die "LDAP User $app already exist" + ldap_user="${app}ldap" + ynh_user_exists $ldap_user || ynh_die "LDAP User $ldap_user already exist" ldap_password=$(head -n128 /dev/urandom | tail -n +1 | tr -dc -d 'a-z0-9' | head -c128) - yunohost user create username f $app -l $app -m $app@$domain -p $ldap_password -q 0 + yunohost user create username -f $ldap_user -l $ldap_user -m $app@$domain -p $ldap_password -q 0 ynh_app_setting_set "$app" ldap_user "$ldap_user" ynh_app_setting_set "$app" ldap_password "$ldap_password" fi @@ -204,24 +205,14 @@ ynh_replace_string "__SMTP_FROM_ADDRESS__" "$admin_mail" "${final_path}/l language="$(echo $language | head -c 2)" ynh_replace_string "__LANGUAGE__" "$language" "$final_path/live/.env.production" -paperclip_secret=$(head -n128 /dev/urandom | tail -n +1 | tr -dc -d 'a-z0-9' | head -c128) ynh_replace_string "PAPERCLIP_SECRET=" "PAPERCLIP_SECRET=$paperclip_secret" "${final_path}/live/.env.production" -ynh_app_setting_set "$app" paperclip_secret "$paperclip_secret" -secret_key_base=$(head -n128 /dev/urandom | tail -n +1 | tr -dc -d 'a-z0-9' | head -c128) ynh_replace_string "__SECRET_KEY_BASE__" "$secret_key_base" "$final_path/live/.env.production" -ynh_app_setting_set "$app" secret_key_base "$secret_key_base" -otp_secret=$(head -n128 /dev/urandom | tail -n +1 | tr -dc -d 'a-z0-9' | head -c128) ynh_replace_string "__OTP_SECRET__" "$otp_secret" "$final_path/live/.env.production" -ynh_app_setting_set "$app" otp_secret "$otp_secret" -ynh_user_exists $app || ynh_die "LDAP User $app already exist" -ldap_password=$(head -n128 /dev/urandom | tail -n +1 | tr -dc -d 'a-z0-9' | head -c128) -yunohost user create username f $app -l $app -m $app@$domain -p $ldap_password -q 0 -ynh_replace_string "__APP__" "$app" "${final_path}/live/.env.production" +ynh_replace_string "__LDAP_USER__" "$ldap_user" "${final_path}/live/.env.production" ynh_replace_string "__LDAP_PASSWORD__" "$ldap_password" "${final_path}/live/.env.production" -ynh_app_setting_set "$app" ldap_password "$ldap_password" #================================================= # UPGRADE MASTODON |