diff options
| author | Noah Swartz <swartzcr@gmail.com> | 2017-07-20 21:02:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-20 21:02:08 +0300 |
| commit | 7d5ccd006b1fc9d9a9fe284188ab9f907f9e0567 (patch) | |
| tree | 00fb96e25a67d5ce1fcc596a26c73bd2b1715c9f | |
| parent | bb6a22b9853cfab2a06cb020ddf57dd5a6ae8eba (diff) | |
| parent | 72b1a6f9cd3be08adb447b0029afcd7b81e27caa (diff) | |
Merge pull request #4904 from certbot/improve-apache-error-message2
Update Apache error message and comment
| -rw-r--r-- | certbot-apache/certbot_apache/configurator.py | 4 | ||||
| -rw-r--r-- | certbot-apache/certbot_apache/tls_sni_01.py | 5 |
2 files changed, 3 insertions, 6 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) 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 <VirtualHost> 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 |