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

Moving full letsencrypt app conflict warning to locales/en.json

Browse source
This commit is contained in:
Alexandre Aubin 2016-11-22 20:32:33 -05:00
parent fb29bb879b
commit be061522e6
2 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
locales/en.json
View file

@ -251,5 +251,5 @@
"certmanager_cert_install_success_selfsigned" : "Successfully installed a self-signed certificate for domain {domain:s} !", "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_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_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."
} }

15
src/yunohost/certificate.py
View file

@ -354,21 +354,6 @@ def _check_old_letsencrypt_app():
if "letsencrypt" not in installedAppIds: if "letsencrypt" not in installedAppIds:
return 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')) raise MoulinetteError(errno.EINVAL, m18n.n('certmanager_old_letsencrypt_app_detected'))