Merge pull request #4814 from certbot/improve-apache-error-message

Correct message about vhost ambiguity
This commit is contained in:
Noah Swartz 2017-07-12 07:53:36 -07:00 committed by GitHub
commit 7efa213b22

View file

@ -85,10 +85,11 @@ def _vhost_menu(domain, vhosts):
"vhosts are not yet supported)".format(domain, os.linesep),
choices, force_interactive=True)
except errors.MissingCommandlineFlag:
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 directives.")
msg = (
"Encountered vhost ambiguity but unable to ask for user "
"guidance in non-interactive mode. Certbot may need "
"vhosts to be explicitly labelled with ServerName or "
"ServerAlias directives.")
logger.warning(msg)
raise errors.MissingCommandlineFlag(msg)