diff --git a/locales/en.json b/locales/en.json index 074512311..ebbe08943 100644 --- a/locales/en.json +++ b/locales/en.json @@ -130,7 +130,6 @@ "certmanager_hit_rate_limit": "Too many certificates already issued for exact set of domains {domain:s} recently. Please try again later. See https://letsencrypt.org/docs/rate-limits/ for more details", "certmanager_http_check_timeout": "Timed out when server tried to contact itself through HTTP using public IP address (domain {domain:s} with ip {ip:s}). You may be experiencing hairpinning issue or the firewall/router ahead of your server is misconfigured.", "certmanager_no_cert_file": "Unable to read certificate file for domain {domain:s} (file: {file:s})", - "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", "certmanager_self_ca_conf_file_not_found": "Configuration file not found for self-signing authority (file: {file:s})", "certmanager_unable_to_parse_self_CA_name": "Unable to parse name of self-signing authority (file: {file:s})", "custom_app_url_required": "You must provide a URL to upgrade your custom app {app:s}", diff --git a/src/yunohost/certificate.py b/src/yunohost/certificate.py index 1b80b6b49..a2886c266 100644 --- a/src/yunohost/certificate.py +++ b/src/yunohost/certificate.py @@ -97,11 +97,6 @@ def certificate_status(auth, domain_list, full=False): import yunohost.domain - # Check if old letsencrypt_ynh is installed - # TODO / FIXME - Remove this in the future once the letsencrypt app is - # not used anymore - _check_old_letsencrypt_app() - # If no domains given, consider all yunohost domains if domain_list == []: domain_list = yunohost.domain.domain_list(auth)['domains'] @@ -144,11 +139,6 @@ def certificate_install(auth, domain_list, force=False, no_checks=False, self_si self-signed -- Instal self-signed certificates instead of Let's Encrypt """ - # Check if old letsencrypt_ynh is installed - # TODO / FIXME - Remove this in the future once the letsencrypt app is - # not used anymore - _check_old_letsencrypt_app() - if self_signed: _certificate_install_selfsigned(domain_list, force) else: @@ -328,11 +318,6 @@ def certificate_renew(auth, domain_list, force=False, no_checks=False, email=Fal import yunohost.domain - # Check if old letsencrypt_ynh is installed - # TODO / FIXME - Remove this in the future once the letsencrypt app is - # not used anymore - _check_old_letsencrypt_app() - # If no domains given, consider all yunohost domains with Let's Encrypt # certificates if domain_list == []: @@ -430,18 +415,6 @@ def certificate_renew(auth, domain_list, force=False, no_checks=False, email=Fal # Back-end stuff # ############################################################################### -def _check_old_letsencrypt_app(): - import yunohost.domain - - installedAppIds = [app["id"] for app in yunohost.app.app_list(installed=True)["apps"]] - - if "letsencrypt" not in installedAppIds: - return - - raise MoulinetteError(errno.EINVAL, m18n.n( - 'certmanager_old_letsencrypt_app_detected')) - - def _install_cron(): cron_job_file = "/etc/cron.daily/yunohost-certificate-renew"