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

Move the general regen_conf after we regen ssh, otherwise there's a non-relevant warning displayed because the regen-conf tells to rerun ssh specifically which is already done...

Browse source
This commit is contained in:
Alexandre Aubin 2020-06-18 15:08:51 +02:00
parent 9c1eca8d4a
commit 7805837b1d
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/yunohost/tools.py
View file

@ -368,7 +368,6 @@ def tools_postinstall(operation_logger, domain, password, ignore_dyndns=False,
service_enable("yunohost-firewall") service_enable("yunohost-firewall")
service_start("yunohost-firewall") service_start("yunohost-firewall")
regen_conf(force=True)
regen_conf(names=["ssh"], force=True) regen_conf(names=["ssh"], force=True)
# Restore original ssh conf, as chosen by the # Restore original ssh conf, as chosen by the
@ -384,6 +383,8 @@ def tools_postinstall(operation_logger, domain, password, ignore_dyndns=False,
if os.path.exists(original_sshd_conf): if os.path.exists(original_sshd_conf):
os.rename(original_sshd_conf, '/etc/ssh/sshd_config') os.rename(original_sshd_conf, '/etc/ssh/sshd_config')
regen_conf(force=True)
logger.success(m18n.n('yunohost_configured')) logger.success(m18n.n('yunohost_configured'))
logger.warning(m18n.n('yunohost_postinstall_end_tip')) logger.warning(m18n.n('yunohost_postinstall_end_tip'))