The QA bench was not working over SSL.

cherokee · Jul 19, 2012 · 13012f9 · 13012f9
1 parent 2510045
commit 13012f9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/qa/conf.py.pre b/qa/conf.py.pre
@@ -17,9 +17,8 @@ LOGGER_ACCESS     = "access.log"
 LOGGER_ERROR      = "error.log"
 
 # TLS/SSL
-SSL_CERT_FILE     = "/etc/cherokee/ssl/cherokee.pem"
-SSL_CERT_KEY_FILE = "/etc/cherokee/ssl/cherokee.pem"
-SSL_CA_FILE       = "/etc/cherokee/ssl/cherokee.pem"
+SSL_CERT_FILE     = "/etc/cherokee/ssl/cherokee.crt"
+SSL_CERT_KEY_FILE = "/etc/cherokee/ssl/cherokee.key"
 
 # Misc options
 SERVER_DELAY      = 10

diff --git a/qa/run-tests.py b/qa/run-tests.py
@@ -217,7 +217,6 @@
 server!bind!1!interface = %(listen)s
 server!bind!2!port = %(PORT_TLS)d
 server!bind!2!tls = 1
-server!bind!2!interface = %(listen)s
 server!keepalive = 1
 server!panic_action = %(panic)s
 server!pid_file = %(pid)s
@@ -260,10 +259,9 @@
 if ssl:
     CONF_BASE += """
 server!tls = libssl
-vserver!1!ssl_certificate_file = %s
-vserver!1!ssl_certificate_key_file = %s
-vserver!1!ssl_ca_list_file = %s
-""" % (SSL_CERT_FILE, SSL_CERT_KEY_FILE, SSL_CA_FILE)
+vserver!1!ssl_certificate_file = %(SSL_CERT_FILE)s
+vserver!1!ssl_certificate_key_file = %(SSL_CERT_KEY_FILE)s
+""" % (globals())
 
 if log:
     CONF_BASE += """