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] replace os.system to a direct call to the good funciton

Browse source
This commit is contained in:
Laurent Peuch 2016-05-13 13:51:44 +02:00
parent 2ff2df12d5
commit 9f383970b7
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/yunohost/domain.py
View file

@ -37,6 +37,7 @@ from moulinette.utils.log import getActionLogger
from yunohost.service import service_regen_conf
from yunohost.hook import hook_callback
from yunohost.dyndns import dyndns_subscribe
from yunohost.app import app_ssowatconf
logger = getActionLogger('yunohost.domain')
@ -154,7 +155,7 @@ def domain_add(auth, domain, dyndns=False):
with open('/etc/yunohost/installed', 'r') as f:
service_regen_conf(names=[
'nginx', 'metronome', 'dnsmasq', 'rmilter'])
assert os.system('yunohost app ssowatconf > /dev/null 2>&1') == 0, "SSOwat conf regen failed"
app_ssowatconf(auth)
except IOError: pass
except:
# Force domain removal silently
@ -199,7 +200,7 @@ def domain_remove(auth, domain, force=False):
raise MoulinetteError(errno.EIO, m18n.n('domain_deletion_failed'))
service_regen_conf(names=['nginx', 'metronome', 'dnsmasq'])
assert os.system('yunohost app ssowatconf > /dev/null 2>&1') == 0, "SSOwat conf regen failed"
app_ssowatconf(auth)
hook_callback('post_domain_remove', args=[domain])