From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 26 May 2022 11:21:06 +0000 (+0000)
Subject: ldap: Read configuration from config file
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af4ed27c4f66b33f62f4ea006f319183e1cbe8ee;p=pbs.git

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 57404e64..ec92d373 100644
--- 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 54b9f258..679ebd5e 100644
--- 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)