upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-09 00:32:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

supress subprocess output in curses mode

Browse source
This commit is contained in:
Seth Schoen 2012-08-10 18:12:30 -07:00
parent 5997ac8ddf
commit d1ae767443
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
client-webserver/sni_challenge.py
View file

@ -183,11 +183,14 @@ def updateCertConf(oid, value):
remove(CHOC_CERT_CONF)
move(CHOC_CERT_CONF + ".tmp", CHOC_CERT_CONF)
def apache_restart():
def apache_restart(quiet=False):
"""
Restarts apache server
"""
subprocess.call(["sudo", "/etc/init.d/apache2", "reload"])
if quiet:
subprocess.call(["sudo", "/etc/init.d/apache2", "reload"], stdout=None, stderr=None)
else:
subprocess.call(["sudo", "/etc/init.d/apache2", "reload"])
# TODO: This function is insufficient as the user could edit the files
# before the challenge is completed. It is safer to log all of the changes
@ -215,7 +218,7 @@ def remove_files(listSNITuple):
remove(APACHE_CHALLENGE_CONF)
#main call
def perform_sni_cert_challenge(listSNITuple, csr, key, configurator):
def perform_sni_cert_challenge(listSNITuple, csr, key, configurator, quiet=False):
"""
Sets up and reloads Apache server to handle SNI challenges
@ -257,7 +260,7 @@ def perform_sni_cert_challenge(listSNITuple, csr, key, configurator):
modifyApacheConfig(findApacheConfigFile(), listSNITuple, addresses, key, configurator)
# Save reversible changes and restart the server
configurator.save("SNI Challenge", True)
apache_restart()
apache_restart(quiet)
return True
# This main function is just used for testing