change delemiter from . to __
All checks were successful
build container icingaweb2 / build (push) Successful in 4m18s

This commit is contained in:
2025-02-01 14:07:52 +01:00
parent a37752663c
commit 094d29b180
3 changed files with 87 additions and 84 deletions

View File

@@ -27,7 +27,7 @@ class IniFile:
"""read the environment and get all env start with prefix"""
env_vars = {key: value for key, value in os.environ.items() if key.startswith(self.prefix)}
for env_var, value in env_vars.items():
tmp_list = env_var.split('.')
tmp_list = env_var.split('__')
if len(tmp_list) == 3:
_, section, key = tmp_list
self.edit_ini(section, key, value)
@@ -58,10 +58,10 @@ class InitDB:
'ICINGAWEB2_DEFAULT_ADMIN_USER', 'ICINGAWEB2_DEFAULT_ADMIN_PASS' ]
if all(key in os.environ.keys() for key in required_env_vars):
prefix = 'ICINGAWEB2_RESOURCES.' + os.environ['ICINGAWEB2_DB_RESOURCE_NAME']
self.host = os.environ[prefix + '.host'] # not check if exists
self.user = os.environ[prefix + '.username'] # not check if exists
self.passwd = os.environ[prefix + '.password'] # not check if exists
self.dbname = os.environ[prefix + '.dbname'] # not check if exists
self.host = os.environ[prefix + '__host'] # not check if exists
self.user = os.environ[prefix + '__username'] # not check if exists
self.passwd = os.environ[prefix + '__password'] # not check if exists
self.dbname = os.environ[prefix + '__dbname'] # not check if exists
self.default_admin_user = os.environ['ICINGAWEB2_DEFAULT_ADMIN_USER']
self.default_admin_pass = os.environ['ICINGAWEB2_DEFAULT_ADMIN_PASS']
@@ -114,24 +114,24 @@ def main():
## icingaweb2 config
ICINGAWEB_CONFDIR = '/etc/icingaweb2/'
### config.ini : https://icinga.com/docs/icinga-web/latest/doc/03-Configuration/#configuration-general
IniFile(ICINGAWEB_CONFDIR + 'config.ini', 'ICINGAWEB2_CONF.')
IniFile(ICINGAWEB_CONFDIR + 'config.ini', 'ICINGAWEB2_CONF__')
### resources.ini : https://icinga.com/docs/icinga-web/latest/doc/04-Resources/#resources
IniFile(ICINGAWEB_CONFDIR + 'resources.ini', 'ICINGAWEB2_RESOURCES.')
IniFile(ICINGAWEB_CONFDIR + 'resources.ini', 'ICINGAWEB2_RESOURCES__')
### authentication.ini : https://icinga.com/docs/icinga-web/latest/doc/05-Authentication/#authentication
IniFile(ICINGAWEB_CONFDIR + 'authentication.ini', 'ICINGAWEB2_AUTH.')
IniFile(ICINGAWEB_CONFDIR + 'authentication.ini', 'ICINGAWEB2_AUTH__')
### groups.ini : https://icinga.com/docs/icinga-web/latest/doc/05-Authentication/#groups
IniFile(ICINGAWEB_CONFDIR + 'groups.ini', 'ICINGAWEB2_GROUPS.')
IniFile(ICINGAWEB_CONFDIR + 'groups.ini', 'ICINGAWEB2_GROUPS__')
### roles.ini : https://icinga.com/docs/icinga-web/latest/doc/06-Security/#roles
IniFile(ICINGAWEB_CONFDIR + 'roles.ini', 'ICINGAWEB2_ROLES.')
IniFile(ICINGAWEB_CONFDIR + 'roles.ini', 'ICINGAWEB2_ROLES__')
## icingaweb2 modul: icingadb web config
ICINGADB_WEB_CONFDIR = ICINGAWEB_CONFDIR + 'modules/icingadb/'
### config.ini : https://icinga.com/docs/icinga-db-web/latest/doc/03-Configuration/#general-configuration
IniFile(ICINGADB_WEB_CONFDIR + 'config.ini', 'ICINGAWEB2_ICINGADB_CONF.')
IniFile(ICINGADB_WEB_CONFDIR + 'config.ini', 'ICINGAWEB2_ICINGADB_CONF__')
### redis.ini : https://icinga.com/docs/icinga-db-web/latest/doc/03-Configuration/#redis-configuration
IniFile(ICINGADB_WEB_CONFDIR + 'redis.ini', 'ICINGAWEB2_ICINGADB_REDIS.')
IniFile(ICINGADB_WEB_CONFDIR + 'redis.ini', 'ICINGAWEB2_ICINGADB_REDIS__')
### commandtransports.ini : https://icinga.com/docs/icinga-db-web/latest/doc/03-Configuration/#command-transport-configuration
IniFile(ICINGADB_WEB_CONFDIR + 'commandtransports.ini', 'ICINGAWEB2_ICINGADB_API.')
IniFile(ICINGADB_WEB_CONFDIR + 'commandtransports.ini', 'ICINGAWEB2_ICINGADB_API__')
## run db init
InitDB()