From be061522e6818a14d4d0d23280292b45a593cc93 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 22 Nov 2016 20:32:33 -0500 Subject: [PATCH] Moving full letsencrypt app conflict warning to locales/en.json --- locales/en.json | 2 +- src/yunohost/certificate.py | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/locales/en.json b/locales/en.json index b3723810e..10dc41edb 100644 --- a/locales/en.json +++ b/locales/en.json @@ -251,5 +251,5 @@ "certmanager_cert_install_success_selfsigned" : "Successfully installed a self-signed certificate for domain {domain:s} !", "certmanager_cert_install_success" : "Successfully installed Let's Encrypt certificate for domain {domain:s} !", "certmanager_cert_renew_success" : "Successfully renewed Let's Encrypt certificate for domain {domain:s} !", - "certmanager_old_letsencrypt_app_detected" : "Command aborted because the letsencrypt app is conflicting with the yunohost certificate management features." + "certmanager_old_letsencrypt_app_detected" : "\nYunohost detected that the 'letsencrypt' app is installed, which conflits with the new built-in certificate management features in Yunohost. If you wish to use the new built-in features, please run the following commands to migrate your installation :\n\n yunohost app remove letsencrypt\n yunohost domain cert-install\n\nN.B. : this will attempt to re-install certificates for all domains with a Let's Encrypt certificate or self-signed certificate." } diff --git a/src/yunohost/certificate.py b/src/yunohost/certificate.py index 22346a460..7a3ded247 100644 --- a/src/yunohost/certificate.py +++ b/src/yunohost/certificate.py @@ -354,21 +354,6 @@ def _check_old_letsencrypt_app(): if "letsencrypt" not in installedAppIds: return - logger.warning(" ") - logger.warning("Yunohost detected that the 'letsencrypt' app is installed, ") - logger.warning("which conflits with the new certificate management features") - logger.warning("directly integrated in Yunohost. If you wish to use these ") - logger.warning("new features, please run the following commands to migrate ") - logger.warning("your installation :") - logger.warning(" ") - logger.warning(" yunohost app remove letsencrypt") - logger.warning(" yunohost domain cert-install") - logger.warning(" ") - logger.warning("N.B. : this will attempt to re-install certificates for ") - logger.warning("all domains with a Let's Encrypt certificate or self-signed") - logger.warning("certificate.") - logger.warning(" ") - raise MoulinetteError(errno.EINVAL, m18n.n('certmanager_old_letsencrypt_app_detected'))