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] only check once if the domain exist

Browse source
This commit is contained in:
Laurent Peuch 2017-08-13 23:37:12 +02:00
parent a8e57d9c6a
commit 555caa9c73
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/yunohost/domain.py
View file

@ -76,7 +76,9 @@ def domain_add(auth, domain, dyndns=False):
attr_dict = {'objectClass': ['mailDomain', 'top']}
if domain in domain_list(auth)['domains']:
try:
auth.validate_uniqueness({'virtualdomain': domain})
except MoulinetteError:
raise MoulinetteError(errno.EEXIST, m18n.n('domain_exists'))
# DynDNS domain
@ -106,11 +108,6 @@ def domain_add(auth, domain, dyndns=False):
try:
yunohost.certificate._certificate_install_selfsigned([domain], False)
try:
auth.validate_uniqueness({'virtualdomain': domain})
except MoulinetteError:
raise MoulinetteError(errno.EEXIST, m18n.n('domain_exists'))
attr_dict['virtualdomain'] = domain
if not auth.add('virtualdomain=%s,ou=domains' % domain, attr_dict):