[or-cvs] r22257: {check} Enable SSL (check/trunk/etc)

[Peter Palfrader <peter@xxxxxxxxxxxxx>]

Author: weasel
Date: 2010-04-29 22:34:53 +0000 (Thu, 29 Apr 2010)
New Revision: 22257

Modified:
   check/trunk/etc/apache.conf
Log:
Enable SSL

Modified: check/trunk/etc/apache.conf
===================================================================
--- check/trunk/etc/apache.conf	2010-04-29 22:16:24 UTC (rev 22256)
+++ check/trunk/etc/apache.conf	2010-04-29 22:34:53 UTC (rev 22257)
@@ -8,7 +8,7 @@
 
 WSGIDaemonProcess check.torproject.org user=nobody group=nogroup home=/srv/check.torproject.org processes=2 threads=16 maximum-requests=1000 umask=0007 display-name=wsgi-check.torproject.org
 
-<VirtualHost *:80>
+<Macro common-check.tpo>
 	ServerName check.torproject.org
 	ServerAlias check2.torproject.org
 	ServerAdmin torproject-admin@xxxxxxxxxxxxxx
@@ -37,5 +37,18 @@
 	RewriteEngine On
 	RewriteRule  ^/$ /torcheck  [PT]
 	RewriteRule  ^/cgi-bin/TorBulkExitList.py$ /torbulkexitlist  [PT]
+</Macro>
+
+<VirtualHost *:80>
+	Use common-check.tpo
 </VirtualHost>
+
+<VirtualHost *:443>
+	Use common-check.tpo
+
+	SSLEngine on
+	SSLCertificateFile    /etc/ssl/certs/wildcard-torproject.pem
+	SSLCertificateKeyFile /etc/ssl/private/wildcard-torproject.key
+</VirtualHost>
+
 # vim:ft=apache: