tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consider `root_dn' and `base_dn' when installing config files 

refs #7163
This commit is contained in:
Johannes Meyer 2014-10-13 09:34:22 +02:00
parent 437b41c6c1
commit 52016d81b9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/Icinga/Application/WebInstaller.php
View File

@ -163,6 +163,7 @@ class WebInstaller implements Installer
$resourceConfig[$this->pageData['setup_ldap_resource']['name']] = array( $resourceConfig[$this->pageData['setup_ldap_resource']['name']] = array(
'hostname' => $this->pageData['setup_ldap_resource']['hostname'], 'hostname' => $this->pageData['setup_ldap_resource']['hostname'],
'port' => $this->pageData['setup_ldap_resource']['port'], 'port' => $this->pageData['setup_ldap_resource']['port'],
'root_dn' => $this->pageData['setup_ldap_resource']['root_dn'],
'bind_dn' => $this->pageData['setup_ldap_resource']['bind_dn'], 'bind_dn' => $this->pageData['setup_ldap_resource']['bind_dn'],
'bind_pw' => $this->pageData['setup_ldap_resource']['bind_pw'] 'bind_pw' => $this->pageData['setup_ldap_resource']['bind_pw']
); );
@ -196,7 +197,7 @@ class WebInstaller implements Installer
$backendConfig[$this->pageData['setup_authentication_backend']['backend']] = array( $backendConfig[$this->pageData['setup_authentication_backend']['backend']] = array(
'backend' => $this->pageData['setup_authentication_backend']['backend'], 'backend' => $this->pageData['setup_authentication_backend']['backend'],
'resource' => $this->pageData['setup_ldap_resource']['name'], 'resource' => $this->pageData['setup_ldap_resource']['name'],
//'root_dn' => $this->pageData['setup_ldap_resource']['root_dn'], 'base_dn' => $this->pageData['setup_authentication_backend']['base_dn'],
'user_class' => $this->pageData['setup_authentication_backend']['user_class'], 'user_class' => $this->pageData['setup_authentication_backend']['user_class'],
'user_name_attribute' => $this->pageData['setup_authentication_backend']['user_name_attribute'] 'user_name_attribute' => $this->pageData['setup_authentication_backend']['user_name_attribute']
); );