upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-08 16:22:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Proper misconfiguration message

Browse source
This commit is contained in:
James Kasten 2015-07-30 01:19:02 -07:00
parent 1570873312
commit e64e3ceab0
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
letsencrypt-apache/letsencrypt_apache/configurator.py
View file

@ -1009,8 +1009,8 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
"""
try:
le_util.run_script([self.conf("ctl"), "configtest"])
except errors.SubprocessError:
raise errors.MisconfigurationError("Config Test failed!")
except errors.SubprocessError as err:
raise errors.MisconfigurationError(str(err))
def get_version(self):
"""Return version of Apache Server.

5
letsencrypt/display/ops.py
View file

@ -84,8 +84,9 @@ def pick_plugin(config, default, plugins, question, ifaces):
logger.debug("Single candidate plugin: %s", plugin_ep)
if plugin_ep.misconfigured:
logger.warning(
"Only candidate plugin, %s, is misconfigured."
"Please fix the configuration before proceeding.", plugin_ep)
"Only candidate plugin, %s, is misconfigured. "
"Please fix the configuration before proceeding.",
plugin_ep.name)
return None
return plugin_ep.init()
else: