upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-05-28 04:34:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Implement PATH fallback for apachectl search

Browse source
This commit is contained in:
Peter Eckersley 2016-07-07 17:54:39 -07:00
parent 754b7956b3
commit a322f44f2b
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
certbot-apache/certbot_apache/configurator.py
View file

@ -159,9 +159,16 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
# Verify Apache is installed
restart_cmd = constants.os_constant("restart_cmd")[0]
if not util.exe_exists(restart_cmd):
logger.warn("Failed to find %s in PATH: %s", restart_cmd, os.environ["PATH"])
raise errors.NoInstallationError(
'Cannot find Apache control command {0}'.format(restart_cmd))
# mitigate https://github.com/certbot/certbot/issues/1833
logger.debug("Can't find %s, attempting PATH mitigation by adding "
"/usr/sbin/ and /usr/local/bin/", restart_cmd)
os.environ["PATH"] = os.pathsep.join((os.environ["PATH"], "/usr/sbin/",
"/usr/local/bin/"))
if not util.exe_exists(restart_cmd):
logger.warn("Failed to find %s in expanded PATH: %s",
restart_cmd, os.environ["PATH"])
raise errors.NoInstallationError(
'Cannot find Apache control command {0}'.format(restart_cmd))
# Make sure configuration is valid
self.config_test()