Add LDAP support and remove script update

conf/.env

@@ -19,7 +19,7 @@ TZ=UTC
 
 # This variable must match your installation's external address but keep in mind that
 # it's only used on the command line as a fallback value.
-APP_URL=http://localhost
+APP_URL=https://yunoappurl
 
 # TRUSTED_PROXIES is a useful variable when using Docker and/or a reverse proxy.
 TRUSTED_PROXIES=
@@ -109,7 +109,7 @@ USE_ENCRYPTION=false
 # and "adldap" for LDAP servers.
 # For full instructions on these settings please visit:
 # https://firefly-iii.readthedocs.io/en/latest/installation/authentication.html
-LOGIN_PROVIDER=eloquent
+LOGIN_PROVIDER=ldap
 
 # LDAP connection configuration
 # OpenLDAP, FreeIPA or ActiveDirectory
@@ -117,10 +117,10 @@ ADLDAP_CONNECTION_SCHEME=OpenLDAP
 ADLDAP_AUTO_CONNECT=true
 
 # LDAP connection settings
-ADLDAP_CONTROLLERS=
+ADLDAP_CONTROLLERS=localhost
 ADLDAP_PORT=389
 ADLDAP_TIMEOUT=5
-ADLDAP_BASEDN=""
+ADLDAP_BASEDN="dc=yunohost,dc=org"
 ADLDAP_FOLLOW_REFFERALS=false
 ADLDAP_USE_SSL=false
 ADLDAP_USE_TLS=false
@@ -128,8 +128,8 @@ ADLDAP_USE_TLS=false
 ADLDAP_ADMIN_USERNAME=
 ADLDAP_ADMIN_PASSWORD=
 
-ADLDAP_ACCOUNT_PREFIX=
-ADLDAP_ACCOUNT_SUFFIX=
+ADLDAP_ACCOUNT_PREFIX="uid="
+ADLDAP_ACCOUNT_SUFFIX=",ou=users,dc=yunohost,dc=org"
 ADLDAP_ADMIN_ACCOUNT_PREFIX=
 ADLDAP_ADMIN_ACCOUNT_SUFFIX=
 
@@ -137,15 +137,15 @@ ADLDAP_ADMIN_ACCOUNT_SUFFIX=
 ADLDAP_PASSWORD_SYNC=false
 ADLDAP_LOGIN_FALLBACK=false
 
-ADLDAP_DISCOVER_FIELD=distinguishedname
-ADLDAP_AUTH_FIELD=distinguishedname
+ADLDAP_DISCOVER_FIELD=uid
+ADLDAP_AUTH_FIELD=uid
 
 # Will allow SSO if your server provides an AUTH_USER field.
 WINDOWS_SSO_DISCOVER=samaccountname
 WINDOWS_SSO_KEY=AUTH_USER
 
 # field to sync as local username.
-ADLDAP_SYNC_FIELD=userprincipalname
+ADLDAP_SYNC_FIELD=uid
 
 # Leave the following configuration vars as is.
 # Unless you like to tinker and know what you're doing.

scripts/install

@@ -138,6 +138,8 @@ ynh_replace_string "yunopass"   "$db_pwd"     "$final_path/.env"
 ynh_replace_string "yunobase"   "$db_name"    "$final_path/.env"
 ynh_replace_string "yunomail"   "$email"      "$final_path/.env"
 ynh_replace_string "yunodomain" "$domain"     "$final_path/.env"
+ynh_replace_string "yunoappurl" "$domain$path_url" "$final_path/.env"
+
 
 #init_composer $final_path $app
 

scripts/remove

@@ -7,6 +7,8 @@
 #=================================================
 
 source _common.sh
+source ynh_add_extra_apt_repos__3
+source ynh_install_php__3
 source /usr/share/yunohost/helpers
 
 #=================================================
@@ -82,7 +84,7 @@ ynh_remove_fpm_config
 ynh_script_progression --message="Removing dependencies..." --time --weight=1
 
 # Remove metapackage and its dependencies
-ynh_remove_php "$phpversion"
+ynh_remove_php 
 
 #=================================================
 # REMOVE LOGROTATE CONFIGURATION