YunoHost-Apps/glitchsoc_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/glitchsoc_ynh.git synced 2024-09-03 19:15:59 +02:00
Code Issues Activity Actions 1

removed LDAP

Browse source 
Mastodon LDAP need authentication
Wasn't able to create a dedicated user
This commit is contained in:
yalh76 2019-03-23 03:33:44 +01:00
parent d1a1e67008
commit 37e462d1ad
4 changed files with 7 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
conf/.env.production.sample
View file

@ -154,14 +154,14 @@ STREAMING_CLUSTER_NUM=1
# GID=1000 # GID=1000
# LDAP authentication (optional) # LDAP authentication (optional)
LDAP_ENABLED=true # LDAP_ENABLED=true
LDAP_HOST=localhost # LDAP_HOST=localhost
LDAP_PORT=389 # LDAP_PORT=389
# LDAP_METHOD=simple_tls # LDAP_METHOD=simple_tls
LDAP_BASE=ou=users,dc=yunohost,dc=org # LDAP_BASE=ou=users,dc=yunohost,dc=org
LDAP_BIND_DN=uid=__LDAP_USER__,ou=users,dc=yunohost,dc=org # LDAP_BIND_DN=uid=__LDAP_USER__,ou=users,dc=yunohost,dc=org
LDAP_PASSWORD=__LDAP_PASSWORD__ # LDAP_PASSWORD=__LDAP_PASSWORD__
LDAP_UID=uid # LDAP_UID=uid
# LDAP_SEARCH_FILTER="%{uid}=%{email}" # LDAP_SEARCH_FILTER="%{uid}=%{email}"
# PAM authentication (optional) # PAM authentication (optional)

8
scripts/install
View file

@ -180,14 +180,6 @@ otp_secret=$(head -n128 /dev/urandom | tail -n +1 | tr -dc -d 'a-z0-9' | head -c
ynh_replace_string "__OTP_SECRET__" "$otp_secret" "$final_path/live/.env.production" ynh_replace_string "__OTP_SECRET__" "$otp_secret" "$final_path/live/.env.production"
ynh_app_setting_set "$app" otp_secret "$otp_secret" ynh_app_setting_set "$app" otp_secret "$otp_secret"
ldap_user="${app}ldap"
ldap_password=$(head -n32 /dev/urandom | tail -n +1 | tr -dc -d 'a-z0-9' | head -c32)
yunohost user create $ldap_user -f $ldap_user -l $ldap_user -m $app@$domain -p $ldap_password -q 0
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_user "$ldap_user"
ynh_app_setting_set "$app" ldap_password "$ldap_password"
#================================================= #=================================================
# INSTALLING MASTODON # INSTALLING MASTODON
#================================================= #=================================================

7
scripts/remove
View file

@ -99,13 +99,6 @@ ynh_remove_nginx_config
#================================================= #=================================================
# SPECIFIC REMOVE # SPECIFIC REMOVE
#=================================================
# REMOVE LDAP USER
#=================================================
# Remove $app LDAP User
yunohost user delete $app --purge
#================================================= #=================================================
# REMOVE THE CRON FILE # REMOVE THE CRON FILE
#================================================= #=================================================

15
scripts/upgrade
View file

@ -34,8 +34,6 @@ port_stream=$(ynh_app_setting_get "$app" port_stream)
paperclip_secret=$(ynh_app_setting_get "$app" paperclip_secret) paperclip_secret=$(ynh_app_setting_get "$app" paperclip_secret)
secret_key_base=$(ynh_app_setting_get "$app" secret_key_base) secret_key_base=$(ynh_app_setting_get "$app" secret_key_base)
otp_secret=$(ynh_app_setting_get "$app" otp_secret) otp_secret=$(ynh_app_setting_get "$app" otp_secret)
ldap_user=$(ynh_app_setting_get "$app" ldap_user)
ldap_password=$(ynh_app_setting_get "$app" ldap_password)
vapid_private_key=$(ynh_app_setting_get "$app" vapid_private_key) vapid_private_key=$(ynh_app_setting_get "$app" vapid_private_key)
vapid_public_key=$(ynh_app_setting_get "$app" vapid_public_key) vapid_public_key=$(ynh_app_setting_get "$app" vapid_public_key)
@ -98,16 +96,6 @@ if [[ -z "$otp_secret" ]]; then
ynh_app_setting_set "$app" otp_secret "$otp_secret" ynh_app_setting_set "$app" otp_secret "$otp_secret"
fi fi
# If ldap_password doesn't exist, retrieve it or create it
if [[ -z "$ldap_user" ]]; then
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 $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
#================================================= #=================================================
# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
#================================================= #=================================================
@ -222,9 +210,6 @@ ynh_replace_string "__SECRET_KEY_BASE__" "$secret_key_base" "$final_path/live/.e
ynh_replace_string "__OTP_SECRET__" "$otp_secret" "$final_path/live/.env.production" ynh_replace_string "__OTP_SECRET__" "$otp_secret" "$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"
#================================================= #=================================================
# UPGRADE MASTODON # UPGRADE MASTODON
#================================================= #=================================================