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

[mod] fails when registering dynette domain and that dynette can't be reached

Browse source
This commit is contained in:
Laurent Peuch 2017-08-13 23:32:50 +02:00
parent 286449386c
commit 4c069c5c3f
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
locales/en.json
View file

@ -143,6 +143,7 @@
"domain_deleted": "The domain has been deleted", "domain_deleted": "The domain has been deleted",
"domain_deletion_failed": "Unable to delete domain", "domain_deletion_failed": "Unable to delete domain",
"domain_dyndns_already_subscribed": "You've already subscribed to a DynDNS domain", "domain_dyndns_already_subscribed": "You've already subscribed to a DynDNS domain",
"domain_dyndns_dynette_is_unreachable": "Unable to reach YunoHost dynette, either your YunoHost is not correctly connected to the internet or the dynette server is down. Error: {error}",
"domain_dyndns_invalid": "Invalid domain to use with DynDNS", "domain_dyndns_invalid": "Invalid domain to use with DynDNS",
"domain_dyndns_root_unknown": "Unknown DynDNS root domain", "domain_dyndns_root_unknown": "Unknown DynDNS root domain",
"domain_exists": "Domain already exists", "domain_exists": "Domain already exists",

25
src/yunohost/domain.py
View file

@ -87,19 +87,20 @@ def domain_add(auth, domain, dyndns=False):
try: try:
r = requests.get('https://dyndns.yunohost.org/domains') r = requests.get('https://dyndns.yunohost.org/domains')
except requests.ConnectionError: except requests.ConnectionError as e:
pass raise MoulinetteError(errno.EHOSTUNREACH,
m18n.n('domain_dyndns_dynette_is_unreachable', error=str(e)))
dyndomains = json.loads(r.text)
dyndomain = '.'.join(domain.split('.')[1:])
if dyndomain in dyndomains:
if os.path.exists('/etc/cron.d/yunohost-dyndns'):
raise MoulinetteError(errno.EPERM,
m18n.n('domain_dyndns_already_subscribed'))
dyndns_subscribe(domain=domain)
else: else:
dyndomains = json.loads(r.text) raise MoulinetteError(errno.EINVAL,
dyndomain = '.'.join(domain.split('.')[1:]) m18n.n('domain_dyndns_root_unknown'))
if dyndomain in dyndomains:
if os.path.exists('/etc/cron.d/yunohost-dyndns'):
raise MoulinetteError(errno.EPERM,
m18n.n('domain_dyndns_already_subscribed'))
dyndns_subscribe(domain=domain)
else:
raise MoulinetteError(errno.EINVAL,
m18n.n('domain_dyndns_root_unknown'))
try: try:
yunohost.certificate._certificate_install_selfsigned([domain], False) yunohost.certificate._certificate_install_selfsigned([domain], False)