upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-07 15:52:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Conform to RFC 1945

Browse source
This commit is contained in:
Peter Eckersley 2017-04-05 11:54:23 -07:00
parent 4846217445
commit a313eebc7f
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
certbot/client.py
View file

@ -53,12 +53,15 @@ def determine_user_agent(config):
"""
if config.user_agent is None:
auto = "no" if cli.cli_command == "certbot" else "yes"
ua = ("CertbotACMEClient/{0} ({1}) Authenticator/{2} Installer/{3} Verb/{4} "
"Renewing/{5} Auto/{6} Py/{7}")
ua = ua.format(certbot.__version__, util.get_os_info_ua(),
if cli.cli_command in ["certbot", "letsencrypt", "certbot-auto", "letsencrypt-auto"]:
auto = cli.cli_command
else:
auto = "other"
ua = ("CertbotACMEClient/{0} ({1}; {2}) Authenticator/{3} Installer/{4} "
"({5}; renewing:{6}) Py/{7}")
ua = ua.format(certbot.__version__, auto, util.get_os_info_ua(),
config.authenticator, config.installer, config.verb, config.renewing,
auto, platform.python_version())
platform.python_version())
else:
ua = config.user_agent
return ua

4
certbot/main.py
View file

@ -226,9 +226,9 @@ def _find_cert(config, domains, certname):
"""
action, lineage = _find_lineage_for_domains_and_certname(config, domains, certname)
if action == "renew":
config.renewing = "Yes"
config.renewing = "yes"
elif action == "newcert":
config.renewing = "No"
config.renewing = "no"
if action == "reinstall":
logger.info("Keeping the existing certificate")
return (action != "reinstall"), lineage