[fix] role:tlscert_acme_inwx
This commit is contained in:
parent
1cb7fe5e68
commit
5c4df42844
|
|
@ -142,10 +142,11 @@ def conf_load(
|
||||||
path : str
|
path : str
|
||||||
):
|
):
|
||||||
global _conf_data
|
global _conf_data
|
||||||
if (not _os.path.exists(path)):
|
conf_data_raw = (
|
||||||
pass
|
_json.loads(file_read(path))
|
||||||
else:
|
if _os.path.exists(path) else
|
||||||
conf_data_raw = _json.loads(file_read(path))
|
{}
|
||||||
|
)
|
||||||
for pair in conf_data_raw.get("url", {}).items():
|
for pair in conf_data_raw.get("url", {}).items():
|
||||||
if ("host" in pair[1]):
|
if ("host" in pair[1]):
|
||||||
pass
|
pass
|
||||||
|
|
@ -194,6 +195,7 @@ def conf_load(
|
||||||
"password": conf_data_raw.get("account", {}).get("password", None),
|
"password": conf_data_raw.get("account", {}).get("password", None),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
print(_json.dumps(_conf_data, indent = "\t"))
|
||||||
|
|
||||||
|
|
||||||
def conf_get(
|
def conf_get(
|
||||||
|
|
@ -620,7 +622,7 @@ def main(
|
||||||
conf_load(args.conf)
|
conf_load(args.conf)
|
||||||
|
|
||||||
## vars
|
## vars
|
||||||
environment = (args.environment or conf_get("environment") or "production")
|
environment = (args.environment or conf_get("environment"))
|
||||||
account_username = (args.username or conf_get("account.username"))
|
account_username = (args.username or conf_get("account.username"))
|
||||||
account_password = (args.password or conf_get("account.password"))
|
account_password = (args.password or conf_get("account.password"))
|
||||||
domain_parts = (None if (args.domain is None) else args.domain.split("."))
|
domain_parts = (None if (args.domain is None) else args.domain.split("."))
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue