Consider root_dn' and base_dn' when installing config files

refs #7163
Icinga · Oct 13, 2014 · 52016d8 · 52016d8
1 parent 437b41c
commit 52016d8
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/library/Icinga/Application/WebInstaller.php b/library/Icinga/Application/WebInstaller.php
@@ -163,6 +163,7 @@ protected function writeResourcesIni($configPath)
             $resourceConfig[$this->pageData['setup_ldap_resource']['name']] = array(
                 'hostname'  => $this->pageData['setup_ldap_resource']['hostname'],
                 '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_pw'   => $this->pageData['setup_ldap_resource']['bind_pw']
             );
@@ -196,7 +197,7 @@ protected function writeAuthenticationIni($configPath)
             $backendConfig[$this->pageData['setup_authentication_backend']['backend']] = array(
                 'backend'               => $this->pageData['setup_authentication_backend']['backend'],
                 '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_name_attribute'   => $this->pageData['setup_authentication_backend']['user_name_attribute']
             );