ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated sample LDAP config to include LDAP version number

Browse Source
This commit is contained in:
snipe
2015-08-14 22:10:34 -07:00
parent e49cfb4bde
commit e9e62fbfaf
5 changed files with 74 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/config/local/ldap.example.php
+13 -1
View File
@@ -91,5 +91,17 @@ return array(
| The LDAP query that we want to execute when authenticating a user
|
*/
'authentication.filter.query' => "uid="
'authentication.filter.query' => "uid=",
/*
|--------------------------------------------------------------------------
| LDAP Version
|--------------------------------------------------------------------------
|
| The LDAP query that we want to execute when authenticating a user
|
*/
'version' => 3,
);
app/config/production/ldap.example.php
+21 -9
View File
@@ -22,7 +22,7 @@ return array(
|
*/
'username' => "",
/*
|--------------------------------------------------------------------------
| Password
@@ -32,7 +32,7 @@ return array(
|
*/
'password' => "",
/*
|--------------------------------------------------------------------------
| Basedn
@@ -42,7 +42,7 @@ return array(
|
*/
'basedn' => "",
/*
|--------------------------------------------------------------------------
@@ -54,11 +54,11 @@ return array(
*/
'filter' => "",
/*
|--------------------------------------------------------------------------
| LDAP field names that will be retrieved to create a user.
|
|
| Using the username as an example:
| If I set 'result.username' => 'my-org-username', the code will connect to
| LDAP as follows (where $results[$i] represents a row in the LDAP query:
@@ -69,20 +69,20 @@ return array(
|
| The search filter for the LDAP query.
|
*/
*/
'result.username' => "",
'result.emp.num' => "",
'result.last.name' => "",
'result.first.name' => "",
'result.email' => "",
/*
| This field is optional as not all LDAP directories will have it. If yours
| does not have it, just leave this field blank and the extra check will
| be omitted.
*/
'result.active.flag' => "",
/*
|--------------------------------------------------------------------------
| LDAP filter query for authentication
@@ -91,5 +91,17 @@ return array(
| The LDAP query that we want to execute when authenticating a user
|
*/
'authentication.filter.query' => "uid="
'authentication.filter.query' => "uid=",
/*
|--------------------------------------------------------------------------
| LDAP Version
|--------------------------------------------------------------------------
|
| The LDAP query that we want to execute when authenticating a user
|
*/
'version' => 3,
);
app/config/staging/ldap.example.php
+13 -1
View File
@@ -91,5 +91,17 @@ return array(
| The LDAP query that we want to execute when authenticating a user
|
*/
'authentication.filter.query' => "uid="
'authentication.filter.query' => "uid=",
/*
|--------------------------------------------------------------------------
| LDAP Version
|--------------------------------------------------------------------------
|
| The LDAP query that we want to execute when authenticating a user
|
*/
'version' => 3,
);
app/config/testing/ldap.example.php
+26 -8
View File
@@ -22,7 +22,7 @@ return array(
|
*/
'username' => "",
/*
|--------------------------------------------------------------------------
| Password
@@ -32,7 +32,7 @@ return array(
|
*/
'password' => "",
/*
|--------------------------------------------------------------------------
| Basedn
@@ -42,7 +42,7 @@ return array(
|
*/
'basedn' => "",
/*
|--------------------------------------------------------------------------
@@ -54,11 +54,11 @@ return array(
*/
'filter' => "",
/*
|--------------------------------------------------------------------------
| LDAP field names that will be retrieved to create a user.
|
|
| Using the username as an example:
| If I set 'result.username' => 'my-org-username', the code will connect to
| LDAP as follows (where $results[$i] represents a row in the LDAP query:
@@ -69,14 +69,20 @@ return array(
|
| The search filter for the LDAP query.
|
*/
*/
'result.username' => "",
'result.emp.num' => "",
'result.last.name' => "",
'result.first.name' => "",
'result.email' => "",
/*
| This field is optional as not all LDAP directories will have it. If yours
| does not have it, just leave this field blank and the extra check will
| be omitted.
*/
'result.active.flag' => "",
/*
|--------------------------------------------------------------------------
| LDAP filter query for authentication
@@ -85,5 +91,17 @@ return array(
| The LDAP query that we want to execute when authenticating a user
|
*/
'authentication.filter.query' => "uid="
'authentication.filter.query' => "uid=",
/*
|--------------------------------------------------------------------------
| LDAP Version
|--------------------------------------------------------------------------
|
| The LDAP query that we want to execute when authenticating a user
|
*/
'ldap_version' => 3,
);
app/config/version.php
+1 -1
View File
@@ -1,5 +1,5 @@
<?php
return array (
'app_version' => 'v2.0-pre',
'hash_version' => 'v2.0-pre-beta-384-ge7d7cc6',
'hash_version' => 'v2.0-pre-beta-390-gdb8ea88',
);