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

Fix configurator restart

Browse source
This commit is contained in:
James Kasten 2013-05-23 22:20:14 -04:00
parent 98e70df5e4
commit 402eadd208
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
trustify/client/configurator.py
View file

@ -1001,21 +1001,23 @@ LogLevel warn \n\
"""
#TODO: This should be written to use the process returncode
try:
p = ''
if quiet:
p = subprocess.Popen(['/etc/init.d/apache2', 'restart'], stdout=subprocess.PIPE, stderr=open("/dev/null", 'w')).communicate()[0]
else:
p = subprocess.Popen(['/etc/init.d/apache2', 'restart'], stderr=subprocess.PIPE).communicate()[0]
p = subprocess.Popen(['/etc/init.d/apache2', 'restart'], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
text = p.communicate()
if p.returncode != 0:
# Enter recovery routine...
logger.error("Configtest failed")
logger.error(text[0])
logger.error(text[1])
return False
if "fail" in p:
logger.error("Apache configuration is incorrect")
logger.error(p)
return False
return True
except:
logger.fatal("Apache Restart Failed - Please Check the Configuration")
sys.exit(1)
return True
def __add_httpd_transform(self, incl):
"""
This function will correctly add a transform to augeas