From d1ae767443f84987b26a41a73e4c347f425dcf67 Mon Sep 17 00:00:00 2001 From: Seth Schoen Date: Fri, 10 Aug 2012 18:12:30 -0700 Subject: [PATCH] supress subprocess output in curses mode --- client-webserver/sni_challenge.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/client-webserver/sni_challenge.py b/client-webserver/sni_challenge.py index 31c7a6fc7..243759ba3 100644 --- a/client-webserver/sni_challenge.py +++ b/client-webserver/sni_challenge.py @@ -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