misc/ansible-base
0
0
Fork 0
Code Issues Pull requests 1 Actions Packages Projects Releases Wiki Activity

[fix] role:tlscert_acme_inwx

Browse source
This commit is contained in:
Christian Fraß 2024-06-01 13:26:46 +02:00
parent 1cb7fe5e68
commit 5c4df42844
1 changed files with 52 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
roles/tlscert_acme_inwx/files/inwx
View file

@ -142,58 +142,60 @@ 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(): )
if ("host" in pair[1]): for pair in conf_data_raw.get("url", {}).items():
pass if ("host" in pair[1]):
else: pass
raise ValueError("flawed conf: missing mandatory value 'host' for url entry '%s'" % pair[0]) else:
_conf_data = { raise ValueError("flawed conf: missing mandatory value 'host' for url entry '%s'" % pair[0])
"url": convey( _conf_data = {
( "url": convey(
{ (
"test": { {
"scheme": "https", "test": {
"host": "api.ote.domrobot.com", "scheme": "https",
"port": 443, "host": "api.ote.domrobot.com",
"path": "jsonrpc/" "port": 443,
}, "path": "jsonrpc/"
"production": { },
"scheme": "https", "production": {
"host": "api.domrobot.com", "scheme": "https",
"port": 443, "host": "api.domrobot.com",
"path": "jsonrpc/" "port": 443,
} "path": "jsonrpc/"
} }
| }
conf_data_raw.get("url", {}) |
), conf_data_raw.get("url", {})
[
lambda x: x.items(),
lambda pairs: map(
lambda pair: (
pair[0],
{
"scheme": pair[1].get("scheme", "https"),
"host": pair[1]["host"],
"port": pair[1].get("port", 443),
"path": pair[1].get("path", "jsonrpc/"),
}
),
pairs
),
dict,
]
), ),
"environment": conf_data_raw.get("environment", "production"), [
"account": { lambda x: x.items(),
"username": conf_data_raw.get("account", {}).get("username", None), lambda pairs: map(
"password": conf_data_raw.get("account", {}).get("password", None), lambda pair: (
} pair[0],
{
"scheme": pair[1].get("scheme", "https"),
"host": pair[1]["host"],
"port": pair[1].get("port", 443),
"path": pair[1].get("path", "jsonrpc/"),
}
),
pairs
),
dict,
]
),
"environment": conf_data_raw.get("environment", "production"),
"account": {
"username": conf_data_raw.get("account", {}).get("username", 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("."))