YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

autodns: return relative name in dry run output

Browse source
This commit is contained in:
Alexandre Aubin 2021-09-17 14:36:46 +02:00
parent a75d9aff34
commit d4d576c492
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/yunohost/dns.py
View file

@ -723,11 +723,14 @@ def domain_dns_push(operation_logger, domain, dry_run=False, force=False, purge=
for record in current: for record in current:
changes["delete"].append(record) changes["delete"].append(record)
def human_readable_record(action, record): def relative_name(name):
name = record["name"]
name = name.strip(".") name = name.strip(".")
name = name.replace('.' + base_dns_zone, "") name = name.replace('.' + base_dns_zone, "")
name = name.replace(base_dns_zone, "@") name = name.replace(base_dns_zone, "@")
return name
def human_readable_record(action, record):
name = relative_name(record["name"])
name = name[:20] name = name[:20]
t = record["type"] t = record["type"]
@ -753,6 +756,9 @@ def domain_dns_push(operation_logger, domain, dry_run=False, force=False, purge=
if dry_run: if dry_run:
if Moulinette.interface.type == "api": if Moulinette.interface.type == "api":
for records in changes.values():
for record in records:
record["name"] = relative_name(record["name"])
return changes return changes
else: else:
out = {"delete": [], "create": [], "update": [], "unchanged": []} out = {"delete": [], "create": [], "update": [], "unchanged": []}