Skip to content
This repository
Browse code

The QA bench was not working over SSL.

  • Loading branch information...
commit 13012f9e919a33a7cde70f48044e2e3ad29b642b 1 parent 2510045
Alvaro Lopez Ortega authored November 20, 2011 davidjb committed July 19, 2012
5  qa/conf.py.pre
@@ -17,9 +17,8 @@ LOGGER_ACCESS     = "access.log"
17 17
 LOGGER_ERROR      = "error.log"
18 18
 
19 19
 # TLS/SSL
20  
-SSL_CERT_FILE     = "/etc/cherokee/ssl/cherokee.pem"
21  
-SSL_CERT_KEY_FILE = "/etc/cherokee/ssl/cherokee.pem"
22  
-SSL_CA_FILE       = "/etc/cherokee/ssl/cherokee.pem"
  20
+SSL_CERT_FILE     = "/etc/cherokee/ssl/cherokee.crt"
  21
+SSL_CERT_KEY_FILE = "/etc/cherokee/ssl/cherokee.key"
23 22
 
24 23
 # Misc options
25 24
 SERVER_DELAY      = 10
8  qa/run-tests.py
@@ -217,7 +217,6 @@
217 217
 server!bind!1!interface = %(listen)s
218 218
 server!bind!2!port = %(PORT_TLS)d
219 219
 server!bind!2!tls = 1
220  
-server!bind!2!interface = %(listen)s
221 220
 server!keepalive = 1
222 221
 server!panic_action = %(panic)s
223 222
 server!pid_file = %(pid)s
@@ -260,10 +259,9 @@
260 259
 if ssl:
261 260
     CONF_BASE += """
262 261
 server!tls = libssl
263  
-vserver!1!ssl_certificate_file = %s
264  
-vserver!1!ssl_certificate_key_file = %s
265  
-vserver!1!ssl_ca_list_file = %s
266  
-""" % (SSL_CERT_FILE, SSL_CERT_KEY_FILE, SSL_CA_FILE)
  262
+vserver!1!ssl_certificate_file = %(SSL_CERT_FILE)s
  263
+vserver!1!ssl_certificate_key_file = %(SSL_CERT_KEY_FILE)s
  264
+""" % (globals())
267 265
 
268 266
 if log:
269 267
     CONF_BASE += """

0 notes on commit 13012f9

Please sign in to comment.
Something went wrong with that request. Please try again.