unit/phi
12
1
Fork 0
Code Issues 5 Pull Requests 1 Releases Activity

Refactor config logic for bools

Browse Source 
If a config paramenter is a boolean, the resulting configuration is the
logic and of all those given (including defaults). BEWARE in future
config implementations!
This commit is contained in:
sfigato 2020-08-29 20:06:08 +02:00
parent 12f37b3a55
commit 6fea75022f
Signed by: blallo
GPG Key ID: 0CBE577C9B72DC3F
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.yml
View File

@ -11,7 +11,7 @@ ldap:
encryption: TLSv1.2 # Can either be None or TLSv1.2. Default: None encryption: TLSv1.2 # Can either be None or TLSv1.2. Default: None
ciphers: "HIGH" ciphers: "HIGH"
validate: True # Can either be True or False. Default: False validate: False # Can either be True or False. Default: False
ca_certs: openldap/cert.pem ca_certs: openldap/cert.pem
username: uid=phi,ou=Services,dc=unit,dc=macaomilano,dc=org username: uid=phi,ou=Services,dc=unit,dc=macaomilano,dc=org
@ -19,7 +19,6 @@ ldap:
base_dn: dc=unit,dc=macaomilano,dc=org base_dn: dc=unit,dc=macaomilano,dc=org
attribute_id: uid attribute_id: uid
attribute_mail: mail
logging: logging:

2
src/phi/config.py
View File

@ -125,6 +125,8 @@ def recursive_merge(main_config, aux_config):
if aux is not None: if aux is not None:
_main.extend(aux) _main.extend(aux)
_ret_config[key] = list(set(_main)) _ret_config[key] = list(set(_main))
elif isinstance(default, bool):
_ret_config[key] = default and aux and main
else: else:
if main is not None: if main is not None:
_ret_config[key] = main _ret_config[key] = main