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

connect domain_push_config to the in-file provider options

Browse source
This commit is contained in:
Paco 2021-05-21 11:32:52 +02:00
parent d4b4024532
commit 914bd1f20a
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/yunohost/domain.py
View file

@ -885,6 +885,13 @@ def domain_push_config(domain):
dns_conf = _build_dns_conf(domains_settings) dns_conf = _build_dns_conf(domains_settings)
provider = domains_settings[domain]["provider"]
if provider == False:
# FIXME add locales
raise YunohostValidationError("registrar_is_not_set", domain=domain)
# Flatten the DNS conf # Flatten the DNS conf
flatten_dns_conf = [] flatten_dns_conf = []
for key in dns_conf: for key in dns_conf:
@ -899,16 +906,6 @@ def domain_push_config(domain):
record["name"] = "{}.{}".format(record["name"], domain) record["name"] = "{}.{}".format(record["name"], domain)
flatten_dns_conf.append(record) flatten_dns_conf.append(record)
# Get provider info
# TODO
provider = {
"name": "gandi",
"options": {
"api_protocol": "rest",
"auth_token": "vhcIALuRJKtoZiZyxfDYWLom"
}
}
# Construct the base data structure to use lexicon's API. # Construct the base data structure to use lexicon's API.
base_config = { base_config = {
"provider_name": provider["name"], "provider_name": provider["name"],
@ -951,7 +948,7 @@ def domain_push_config(domain):
for distant_record in distant_records[record["type"]]: for distant_record in distant_records[record["type"]]:
if distant_record["type"] == record["type"] and distant_record["name"] == record["name"]: if distant_record["type"] == record["type"] and distant_record["name"] == record["name"]:
it_exists = True it_exists = True
# previous TODO # see previous TODO
# if distant_record["ttl"] = ... and distant_record["name"] ... # if distant_record["ttl"] = ... and distant_record["name"] ...
# is_the_same_record = True # is_the_same_record = True
@ -961,7 +958,7 @@ def domain_push_config(domain):
"type": record["type"], # specify a type for record filtering, case sensitive in some cases. "type": record["type"], # specify a type for record filtering, case sensitive in some cases.
"name": record["name"], "name": record["name"],
"content": record["value"], "content": record["value"],
# FIXME Delte TTL, doesn't work with Gandi. # FIXME Removed TTL, because it doesn't work with Gandi.
# See https://github.com/AnalogJ/lexicon/issues/726 (similar issue) # See https://github.com/AnalogJ/lexicon/issues/726 (similar issue)
# But I think there is another issue with Gandi. Or I'm misusing the API... # But I think there is another issue with Gandi. Or I'm misusing the API...
# "ttl": record["ttl"], # "ttl": record["ttl"],