From 7805837b1dcfec03c7309f8f44ff0589e503acd0 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 18 Jun 2020 15:08:51 +0200 Subject: [PATCH] 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... --- src/yunohost/tools.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/yunohost/tools.py b/src/yunohost/tools.py index 9221e6c7d..40d66586c 100644 --- a/src/yunohost/tools.py +++ b/src/yunohost/tools.py @@ -368,7 +368,6 @@ def tools_postinstall(operation_logger, domain, password, ignore_dyndns=False, service_enable("yunohost-firewall") service_start("yunohost-firewall") - regen_conf(force=True) regen_conf(names=["ssh"], force=True) # 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): os.rename(original_sshd_conf, '/etc/ssh/sshd_config') + regen_conf(force=True) + logger.success(m18n.n('yunohost_configured')) logger.warning(m18n.n('yunohost_postinstall_end_tip'))