diff --git a/certbot/certbot/_internal/main.py b/certbot/certbot/_internal/main.py index 8240bad20..5c2631c52 100644 --- a/certbot/certbot/_internal/main.py +++ b/certbot/certbot/_internal/main.py @@ -493,15 +493,17 @@ def _report_new_cert(config, cert_path, fullchain_path, key_path=None): ("\nSuccessfully received certificate.\n" "Certificate is saved at: {cert_path}\n{key_msg}" "This certificate expires on {expiry}.\n" - "{renew_msg}\n").format( + "These files will be updated when the certificate renews.\n{renew_msg}\n").format( cert_path=fullchain_path, expiry=crypto_util.notAfter(cert_path).date(), key_msg="Key is saved at: {}\n".format(key_path) if key_path else "", renew_msg="Certbot will automatically renew this certificate in the background." if config.preconfigured_renewal else - ("These files will be updated when the certificate renews. " - f'Run "{cli.cli_constants.cli_command} renew" to renew ' - "all expiring certificates.") + (f'Run "{cli.cli_constants.cli_command} renew" to renew ' + "expiring certificates. " + "We recommend setting up a scheduled task for renewal, see " + "https://certbot.eff.org/docs/using.html#automated-renewals " + "for instructions.") ) ) diff --git a/certbot/tests/main_test.py b/certbot/tests/main_test.py index eaa20e6c9..d9f045ae9 100644 --- a/certbot/tests/main_test.py +++ b/certbot/tests/main_test.py @@ -1806,6 +1806,7 @@ class ReportNewCertTest(unittest.TestCase): 'Certificate is saved at: /path/to/fullchain.pem\n' 'Key is saved at: /path/to/privkey.pem\n' 'This certificate expires on 1970-01-01.\n' + 'These files will be updated when the certificate renews.\n' 'Certbot will automatically renew this certificate in the background.\n' ) @@ -1818,6 +1819,7 @@ class ReportNewCertTest(unittest.TestCase): '\nSuccessfully received certificate.\n' 'Certificate is saved at: /path/to/fullchain.pem\n' 'This certificate expires on 1970-01-01.\n' + 'These files will be updated when the certificate renews.\n' 'Certbot will automatically renew this certificate in the background.\n' ) @@ -1831,8 +1833,10 @@ class ReportNewCertTest(unittest.TestCase): 'Certificate is saved at: /path/to/fullchain.pem\n' 'Key is saved at: /path/to/privkey.pem\n' 'This certificate expires on 1970-01-01.\n' - 'These files will be updated when the certificate renews. ' - 'Run "certbot renew" to renew all expiring certificates.\n' + 'These files will be updated when the certificate renews.\n' + 'Run "certbot renew" to renew expiring certificates. We recommend setting up a ' + 'scheduled task for renewal, see https://certbot.eff.org/docs/using.html#automated' + '-renewals for instructions.\n' )