From 021313acd12a4449b40c496d6dbe5ebcd33117c0 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Mon, 29 Aug 2016 17:08:46 -0700 Subject: [PATCH] make port flags more visible with better help --- certbot/cli.py | 5 +++-- certbot/interfaces.py | 9 ++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/certbot/cli.py b/certbot/cli.py index c236041ce..942fc8ac2 100644 --- a/certbot/cli.py +++ b/certbot/cli.py @@ -790,11 +790,12 @@ def prepare_and_parse_args(plugins, args, detect_defaults=False): # pylint: dis help=config_help("no_verify_ssl"), default=flag_default("no_verify_ssl")) helpful.add( - "testing", "--tls-sni-01-port", type=int, + ["certonly", "renew", "run"], "--tls-sni-01-port", type=int, default=flag_default("tls_sni_01_port"), help=config_help("tls_sni_01_port")) helpful.add( - "testing", "--http-01-port", type=int, dest="http01_port", + ["certonly", "renew", "run"], "--http-01-port", type=int, + dest="http01_port", default=flag_default("http01_port"), help=config_help("http01_port")) helpful.add( "testing", "--break-my-certs", action="store_true", diff --git a/certbot/interfaces.py b/certbot/interfaces.py index d4b391378..42a952f10 100644 --- a/certbot/interfaces.py +++ b/certbot/interfaces.py @@ -229,11 +229,14 @@ class IConfig(zope.interface.Interface): no_verify_ssl = zope.interface.Attribute( "Disable verification of the ACME server's certificate.") tls_sni_01_port = zope.interface.Attribute( - "Port number to perform tls-sni-01 challenge. " - "Boulder in testing mode defaults to 5001.") + "Port used during tls-sni-01 challenge. " + "This only affects the port Certbot listens on. " + "A conforming ACME server will still attempt to connect on port 443.") http01_port = zope.interface.Attribute( - "Port used in the SimpleHttp challenge.") + "Port used in the http-01 challenge." + "This only affects the port Certbot listens on. " + "A conforming ACME server will still attempt to connect on port 80.") class IInstaller(IPlugin):