ldap: Read configuration from config file

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/pbs.conf.sample b/pbs.conf.sample
index 57404e64a4f845fdb7674671300a109895a99af2..ec92d3738e16fce7952baf38d8b50c0cfa735d0f 100644 (file)
--- a/pbs.conf.sample
+++ b/pbs.conf.sample
@@ -5,3 +5,8 @@ name      = pakfire
 hostname  = db-master.ipfire.org
 user      = pakfire
 password  = pakfire
+
+[ldap]
+
+uri =
+base =

diff --git a/src/buildservice/ldap.py b/src/buildservice/ldap.py
index 54b9f258a7c2a63e9661b16aec6fa46fda3982ec..679ebd5edf2a6f6984531a7641069da0d5f7f169 100644 (file)
--- a/src/buildservice/ldap.py
+++ b/src/buildservice/ldap.py
@@ -1,7 +1,5 @@
 #!/usr/bin/python
 
-
-
 import ldap
 import logging
 
@@ -14,7 +12,7 @@ from .decorators import *
 class LDAP(base.Object):
        @lazy_property
        def ldap(self):
-               ldap_uri = self.settings.get("ldap_uri")
+               ldap_uri = self.backend.config.get("ldap", "uri")
 
                log.debug("Connecting to %s..." % ldap_uri)
 
@@ -24,7 +22,7 @@ class LDAP(base.Object):
        def search(self, query, attrlist=None, limit=0):
                log.debug("Performing LDAP query: %s" % query)
 
-               search_base = self.settings.get("ldap_search_base")
+               search_base = self.backend.config.get("ldap", "base")
 
                results = self.ldap.search_ext_s(search_base, ldap.SCOPE_SUBTREE,
                        query, attrlist=attrlist, sizelimit=limit)