From bf763cbbc6c1255086b16343d0b2a08757f54911 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Wed, 5 Jul 2017 10:00:14 -0400 Subject: [PATCH 1/2] remove outdated error message --- certbot-apache/certbot_apache/configurator.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/certbot-apache/certbot_apache/configurator.py b/certbot-apache/certbot_apache/configurator.py index 097c4ff42..9e3eb4139 100644 --- a/certbot-apache/certbot_apache/configurator.py +++ b/certbot-apache/certbot_apache/configurator.py @@ -347,9 +347,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator): vhost = display_ops.select_vhost(target_name, self.vhosts) if vhost is None: logger.error( - "No vhost exists with servername or alias of: %s " - "(or it's in a file with multiple vhosts, which Certbot " - "can't parse yet). " + "No vhost exists with servername or alias of %s. " "No vhost was selected. Please specify ServerName or ServerAlias " "in the Apache config, or split vhosts into separate files.", target_name) From 72b1a6f9cd3be08adb447b0029afcd7b81e27caa Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Wed, 5 Jul 2017 10:03:02 -0400 Subject: [PATCH 2/2] Update outdated comment --- certbot-apache/certbot_apache/tls_sni_01.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/certbot-apache/certbot_apache/tls_sni_01.py b/certbot-apache/certbot_apache/tls_sni_01.py index 65a66d2fd..da64400b1 100644 --- a/certbot-apache/certbot_apache/tls_sni_01.py +++ b/certbot-apache/certbot_apache/tls_sni_01.py @@ -126,9 +126,8 @@ class ApacheTlsSni01(common.TLSSNI01): vhost = self.configurator.choose_vhost(achall.domain, temp=True) except (PluginError, MissingCommandlineFlag): # We couldn't find the virtualhost for this domain, possibly - # because it's a new vhost that's not configured yet (GH #677), - # or perhaps because there were multiple sections - # in the config file (GH #1042). See also GH #2600. + # because it's a new vhost that's not configured yet + # (GH #677). See also GH #2600. logger.warning("Falling back to default vhost %s...", default_addr) addrs.add(default_addr) return addrs