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

[fix] Do not restart yunohost-api anymore

Browse source
This commit is contained in:
Kload 2014-05-17 21:40:24 +02:00
parent d7bc60bcbc
commit 4599a2724f
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tools.py
View file

@ -149,19 +149,13 @@ def tools_maindomain(auth, old_domain=None, new_domain=None, dyndns=False):
'ln -s /etc/yunohost/certs/%s/key.pem /etc/ssl/private/yunohost_key.pem' % new_domain, 'ln -s /etc/yunohost/certs/%s/key.pem /etc/ssl/private/yunohost_key.pem' % new_domain,
'ln -s /etc/yunohost/certs/%s/crt.pem /etc/ssl/certs/yunohost_crt.pem' % new_domain, 'ln -s /etc/yunohost/certs/%s/crt.pem /etc/ssl/certs/yunohost_crt.pem' % new_domain,
'echo %s > /etc/yunohost/current_host' % new_domain, 'echo %s > /etc/yunohost/current_host' % new_domain,
'service nginx restart',
'service metronome restart', 'service metronome restart',
'service postfix restart', 'service postfix restart',
'service dovecot restart', 'service dovecot restart',
'service amavis restart' 'service amavis restart',
'service nginx restart',
] ]
try:
with open('/etc/yunohost/light') as f: pass
except IOError:
command_list.append('service amavis restart')
#command_list.append('service tahoe-lafs restart')
for command in command_list: for command in command_list:
if os.system(command) != 0: if os.system(command) != 0:
raise MoulinetteError(errno.EPERM, raise MoulinetteError(errno.EPERM,
@ -286,7 +280,6 @@ def tools_postinstall(domain, password, dyndns=False):
tools_adminpw(old_password='yunohost', new_password=password) tools_adminpw(old_password='yunohost', new_password=password)
os.system('touch /etc/yunohost/installed') os.system('touch /etc/yunohost/installed')
os.system('service yunohost-api restart &')
msignals.display(m18n.n('yunohost_configured'), 'success') msignals.display(m18n.n('yunohost_configured'), 'success')
@ -319,7 +312,7 @@ def tools_update(ignore_apps=False, ignore_packages=False):
'fullname': pkg.fullname, 'fullname': pkg.fullname,
'changelog': pkg.get_changelog() 'changelog': pkg.get_changelog()
}) })
apps = [] apps = []
if not ignore_apps: if not ignore_apps:
app_fetchlist() app_fetchlist()
@ -347,7 +340,7 @@ def tools_update(ignore_apps=False, ignore_packages=False):
'id': app_id, 'id': app_id,
'label': current_app_dict['settings']['label'] 'label': current_app_dict['settings']['label']
}) })
if len(apps) == 0 and len(packages) == 0: if len(apps) == 0 and len(packages) == 0:
msignals.display(m18n.n('system_no_upgrade'), 'success') msignals.display(m18n.n('system_no_upgrade'), 'success')
@ -369,7 +362,7 @@ def tools_upgrade(ignore_apps=False, ignore_packages=False):
cache = apt.Cache() cache = apt.Cache()
cache.open(None) cache.open(None)
cache.upgrade(True) cache.upgrade(True)
# If API call # If API call
if not os.isatty(1): if not os.isatty(1):
critical_packages = ["moulinette", "moulinette-yunohost", "yunohost-admin", "yunohost-config-nginx", "ssowat", "python"] critical_packages = ["moulinette", "moulinette-yunohost", "yunohost-admin", "yunohost-config-nginx", "ssowat", "python"]