Index: vhosts/conf.d/djq.conf
===================================================================
--- vhosts/conf.d/djq.conf	(revision 183)
+++ vhosts/conf.d/djq.conf	(revision 244)
@@ -4,15 +4,16 @@
 	DocumentRoot /afs/athena.mit.edu/user/d/j/djq/web_scripts/wiki
 	SuExecUserGroup djq djq
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName djq.mit.edu
-	ServerAlias djq
-	DocumentRoot /afs/athena.mit.edu/user/d/j/djq/web_scripts/wiki
-	SuExecUserGroup djq djq
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName djq.mit.edu
+		ServerAlias djq
+		DocumentRoot /afs/athena.mit.edu/user/d/j/djq/web_scripts/wiki
+		SuExecUserGroup djq djq
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
 
 <VirtualHost *:80>
@@ -21,13 +22,14 @@
 	DocumentRoot /afs/athena.mit.edu/user/d/j/djq/web_scripts/wiki
 	SuExecUserGroup djq djq
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName haiti.mit.edu
-	ServerAlias haiti
-	DocumentRoot /afs/athena.mit.edu/user/d/j/djq/web_scripts/wiki
-	SuExecUserGroup djq djq
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName haiti.mit.edu
+		ServerAlias haiti
+		DocumentRoot /afs/athena.mit.edu/user/d/j/djq/web_scripts/wiki
+		SuExecUserGroup djq djq
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>