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

yunomdns: fallback to domain-i.local if domain.local already published

Browse source
This commit is contained in:
Alexandre Aubin 2021-09-29 19:14:21 +02:00
parent ab1100048b
commit f49666d22e
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
bin/yunomdns
View file

@ -76,20 +76,27 @@ def main() -> bool:
browser.cancel()
zc.close()
# If yunohost.local already exists, try yunohost-2.local, and so on.
def yunohost_local(i):
return "yunohost.local" if i < 2 else f"yunohost-{i}.local"
# Always attempt to publish yunohost.local
if "yunohost.local" not in config["domains"]:
config["domains"].append("yunohost.local")
i = 1
while yunohost_local(i) in listener.list:
print(f"Uh oh, {yunohost_local(i)} already exists on the network...")
if yunohost_local(i) in config['domains']:
config['domains'].remove(yunohost_local(i))
i += 1
def find_domain_not_already_published(domain):
if yunohost_local(i) not in config['domains']:
print(f"Adding {yunohost_local(i)} to the domains to publish.")
config['domains'].append(yunohost_local(i))
# Try domain.local ... but if it's already published by another entity,
# try domain-2.local, domain-3.local, ...
i = 1
domain_i = domain
while domain_i in listener.list:
print(f"Uh oh, {domain_i} already exists on the network...")
i += 1
domain_i = domain.replace(".local", f"-{i}.local")
return domain_i
config['domains'] = [find_domain_not_already_published(domain) for domain in config['domains']]
zcs: Dict[Zeroconf, List[ServiceInfo]] = {}