Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

The QA bench was not working over SSL.

  • Loading branch information...
commit 13012f9e919a33a7cde70f48044e2e3ad29b642b 1 parent 2510045
Alvaro Lopez Ortega alobbs authored davidjb committed
Showing with 5 additions and 8 deletions.
  1. +2 −3 qa/conf.py.pre
  2. +3 −5 qa/run-tests.py
5 qa/conf.py.pre
View
@@ -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
8 qa/run-tests.py
View
@@ -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 += """
Please sign in to comment.
Something went wrong with that request. Please try again.