From 19710c3eab8fed86b99c562601ba966034617d80 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 15 Feb 2019 07:39:12 +0100 Subject: [PATCH] Update LDAP config for #2085 --- config/ldap.php | 13 ++++++++----- config/ldap_auth.php | 15 +++++++++++++++ 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/config/ldap.php b/config/ldap.php index 32703cc78a..137e47f7e2 100644 --- a/config/ldap.php +++ b/config/ldap.php @@ -164,7 +164,8 @@ return [ | */ - 'domain_controllers' => explode(' ', env('ADLDAP_CONTROLLERS', '127.0.0.1')), + //'domain_controllers' => explode(' ', env('ADLDAP_CONTROLLERS', '127.0.0.1')), + 'hosts' => explode(' ', env('ADLDAP_CONTROLLERS', '127.0.0.1')), /* |-------------------------------------------------------------------------- @@ -219,8 +220,10 @@ return [ | */ - 'admin_username' => env('ADLDAP_ADMIN_USERNAME', ''), - 'admin_password' => env('ADLDAP_ADMIN_PASSWORD', ''), + //'admin_username' => env('ADLDAP_ADMIN_USERNAME', ''), + //'admin_password' => env('ADLDAP_ADMIN_PASSWORD', ''), + 'username' => env('ADLDAP_ADMIN_USERNAME', ''), + 'password' => env('ADLDAP_ADMIN_PASSWORD', ''), /* |-------------------------------------------------------------------------- @@ -246,8 +249,8 @@ return [ | If you need to be able to change user passwords on your server, then an | SSL or TLS connection is required. All other operations are allowed | on unsecured protocols. - | - | One of these options are definitely recommended if you + | + | One of these options are definitely recommended if you | have the ability to connect to your server securely. | */ diff --git a/config/ldap_auth.php b/config/ldap_auth.php index 88da45871b..00d6eb5c16 100644 --- a/config/ldap_auth.php +++ b/config/ldap_auth.php @@ -77,6 +77,21 @@ return [ 'provider' => Adldap\Laravel\Auth\DatabaseUserProvider::class, //'provider' => Adldap\Laravel\Auth\NoDatabaseUserProvider::class, + + + /* + |-------------------------------------------------------------------------- + | Model + |-------------------------------------------------------------------------- + | + | The model to utilize for authentication and importing. + | + | This option is only applicable to the DatabaseUserProvider. + | + */ + + 'model' => FireflyIII\User::class, + /* |-------------------------------------------------------------------------- | Rules