From: Michael Tremer Date: Wed, 12 Oct 2022 17:05:53 +0000 (+0000) Subject: backend: Drop reading any configuration from the environment X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b100923a8ccfd563b58eb67cf6f35f9a664b655;p=pbs.git backend: Drop reading any configuration from the environment Signed-off-by: Michael Tremer --- diff --git a/src/buildservice/__init__.py b/src/buildservice/__init__.py index 34635f9a..c56cda91 100644 --- a/src/buildservice/__init__.py +++ b/src/buildservice/__init__.py @@ -81,30 +81,9 @@ class Backend(object): log.info("Pakfire Build Service initialized at %s" % self.basepath) - @lazy_property - def _environment_configuration(self): - env = {} - - # Get database configuration - env["database"] = { - "name" : os.environ.get("PBS_DATABASE_NAME"), - "hostname" : os.environ.get("PBS_DATABASE_HOSTNAME"), - "user" : os.environ.get("PBS_DATABASE_USER"), - "password" : os.environ.get("PBS_DATABASE_PASSWORD"), - } - - return env - def read_config(self, path): c = configparser.ConfigParser() - # Import configuration from environment - for section in self._environment_configuration: - c.add_section(section) - - for k in self._environment_configuration[section]: - c.set(section, k, self._environment_configuration[section][k] or "") - # Load default configuration file first paths = [ os.path.join(CONFIGSDIR, "pbs.conf"),