mirror of
https://github.com/FAUSheppy/atlantis-event-dispatcher
synced 2025-12-09 07:48:33 +01:00
fix: args should overwrite env
This commit is contained in:
@@ -164,10 +164,11 @@ def create_app():
|
|||||||
print("Missing ENV Variable SIGNAL_GATEWAY_PASS", file=sys.stderr)
|
print("Missing ENV Variable SIGNAL_GATEWAY_PASS", file=sys.stderr)
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
|
if not app.config.get("LDAP_NO_READ_ENV"):
|
||||||
ldap_args = {
|
ldap_args = {
|
||||||
"LDAP_SERVER" : os.environ["LDAP_SERVER"],
|
"LDAP_SERVER" : os.environ["LDAP_SERVER"],
|
||||||
"LDAP_BIND_DN" : os.environ["LDAP_BIND_DN"]
|
"LDAP_BIND_DN" : os.environ["LDAP_BIND_DN"],
|
||||||
"LDAP_BIND_PW" : os.environ["LDAP_BIND_PW"]
|
"LDAP_BIND_PW" : os.environ["LDAP_BIND_PW"],
|
||||||
"LDAP_BASE_DN" : os.environ["LDAP_BASE_DN"]
|
"LDAP_BASE_DN" : os.environ["LDAP_BASE_DN"]
|
||||||
}
|
}
|
||||||
app.config["LDAP_ARGS"] = ldap_args
|
app.config["LDAP_ARGS"] = ldap_args
|
||||||
@@ -195,6 +196,7 @@ if __name__ == "__main__":
|
|||||||
"LDAP_BIND_DN" : args.ldap_manager_dn,
|
"LDAP_BIND_DN" : args.ldap_manager_dn,
|
||||||
"LDAP_BIND_PW" : args.ldap_manager_password,
|
"LDAP_BIND_PW" : args.ldap_manager_password,
|
||||||
"LDAP_BASE_DN" : args.ldap_base_dn,
|
"LDAP_BASE_DN" : args.ldap_base_dn,
|
||||||
|
"LDAP_NO_READ_ENV" : True
|
||||||
}
|
}
|
||||||
|
|
||||||
if not any([value is None for value in ldap_args.values()]):
|
if not any([value is None for value in ldap_args.values()]):
|
||||||
|
|||||||
Reference in New Issue
Block a user