starred/certbot-certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-01 19:02:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Silenced remaining stdout

Browse Source
This commit is contained in:
James Kasten
2012-08-12 15:09:59 -04:00
parent 45aa3b5ac9
commit d2ff543205
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trustify/client/client.py
+1 -1
View File
@@ -335,7 +335,7 @@ def authenticate():
#cert_chain_abspath = os.path.abspath(chain_file) #cert_chain_abspath = os.path.abspath(chain_file)
for host in vhost: for host in vhost:
config.deploy_cert(host, os.path.abspath(cert_file), os.path.abspath(key_file), cert_chain_abspath) config.deploy_cert(host, os.path.abspath(cert_file), os.path.abspath(key_file), cert_chain_abspath)
sni_challenge.apache_restart(curses) sni_challenge.apache_restart(quiet=curses)
elif r.failure.IsInitialized(): elif r.failure.IsInitialized():
print "Server reported failure." print "Server reported failure."
sys.exit(1) sys.exit(1)
trustify/client/configurator.py
+1 -1
View File
@@ -571,7 +571,7 @@ class Configurator(object):
for all saves with reversible=True for all saves with reversible=True
""" """
for f in self.mod_files: for f in self.mod_files:
print "reverting", f #print "reverting", f
os.rename(f + ".augsave", f) os.rename(f + ".augsave", f)
self.aug.load() self.aug.load()
self.mod_files.clear() self.mod_files.clear()
trustify/client/sni_challenge.py
+3 -3
View File
@@ -100,7 +100,7 @@ def checkForApacheConfInclude(mainConfig, configurator):
result: User Apache configuration includes chocolate sni challenge file result: User Apache configuration includes chocolate sni challenge file
""" """
if len(configurator.find_directive("Include", APACHE_CHALLENGE_CONF)) == 0: if len(configurator.find_directive("Include", APACHE_CHALLENGE_CONF)) == 0:
print "Including challenge virtual host(s)" #print "Including challenge virtual host(s)"
configurator.add_dir("/files" + mainConfig, "Include", APACHE_CHALLENGE_CONF) configurator.add_dir("/files" + mainConfig, "Include", APACHE_CHALLENGE_CONF)
def createChallengeCert(oid, ext, nonce, csr, key): def createChallengeCert(oid, ext, nonce, csr, key):
@@ -117,7 +117,7 @@ def createChallengeCert(oid, ext, nonce, csr, key):
""" """
updateCertConf(oid, ext) updateCertConf(oid, ext)
subprocess.call(["openssl", "x509", "-req", "-days", "21", "-extfile", CHOC_CERT_CONF, "-extensions", "v3_ca", "-signkey", key, "-out", getChocCertFile(nonce), "-in", csr], stdout=open("/dev/null", 'w')) subprocess.call(["openssl", "x509", "-req", "-days", "21", "-extfile", CHOC_CERT_CONF, "-extensions", "v3_ca", "-signkey", key, "-out", getChocCertFile(nonce), "-in", csr], stdout=open("/dev/null", 'w'), stderr=open("/dev/null", 'w'))
def generateExtension(key, y): def generateExtension(key, y):
@@ -198,7 +198,7 @@ def cleanup(listSNITuple, configurator):
result: Apache server is restored to the pre-challenge state result: Apache server is restored to the pre-challenge state
""" """
configurator.revert_config() configurator.revert_config()
apache_restart() apache_restart(True)
remove_files(listSNITuple) remove_files(listSNITuple)