crypt/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-01-26 07:41:33 +03:00
Code Activity

Provide clear log messages when Apache tries a default vhost

Browse Source
This commit is contained in:
Peter Eckersley
2016-06-24 18:43:29 -07:00
parent f6069c2297
commit e0691ede2c
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
certbot-apache/certbot_apache/configurator.py
View File

@@ -327,9 +327,12 @@ 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. "
"No vhost was selected. Please specify servernames "
"in the Apache config", target_name)
"No vhost exists with servername or alias of: %s "
"(or it's in a file with multiple files, which Certbot "
"can't parse yet). "
"No vhost was selected. Please specify ServerName or ServerAlias "
"in the Apache config, or split vhosts into separate files.",
target_name)
raise errors.PluginError("No vhost selected")
elif temp:
return vhost

9
certbot-apache/certbot_apache/display_ops.py
View File

@@ -87,10 +87,11 @@ def _vhost_menu(domain, vhosts):
"vhosts are not yet supported)".format(domain, os.linesep),
choices, help_label="More Info", ok_label="Select")
except errors.MissingCommandlineFlag as e:
msg = ("Failed to run Apache plugin non-interactively{1}{0}{1}"
"(The best solution is to add ServerName or ServerAlias "
"entries to the VirtualHost directives of your apache "
"configuration files.)".format(e, os.linesep))
msg = ("Encountered vhost ambiguity but unable to ask for user guidance in "
"non-interactive mode. Currently Certbot needs each vhost to be "
"in its own conf file, and may need vhosts to be explicitly "
"labelled with ServerName or ServerAlias directories.")
logger.warn(msg)
raise errors.MissingCommandlineFlag(msg)
return code, tag

4
certbot-apache/certbot_apache/tls_sni_01.py
View File

@@ -124,12 +124,12 @@ class ApacheTlsSni01(common.TLSSNI01):
try:
vhost = self.configurator.choose_vhost(achall.domain, temp=True)
except (PluginError, MissingCommandlineFlag):
except (PluginError, MissingCommandlineFlag), e:
# 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.
logger.warn("Attempting to fall back to default vhost %s...", default_addr)
logger.warn("Falling back to default vhost %s...", default_addr)
addrs.add(default_addr)
return addrs