Index: /server/fedora/config/etc/httpd/conf.d/vhosts-common-ssl.conf
===================================================================
--- /server/fedora/config/etc/httpd/conf.d/vhosts-common-ssl.conf	(revision 244)
+++ /server/fedora/config/etc/httpd/conf.d/vhosts-common-ssl.conf	(revision 244)
@@ -0,0 +1,4 @@
+# This file will be included inside each <VirtualHost *:443> block.
+
+SSLEngine on
+KeepAlive off
Index: /server/fedora/config/etc/httpd/conf.d/vhosts-common.conf
===================================================================
--- /server/fedora/config/etc/httpd/conf.d/vhosts-common.conf	(revision 244)
+++ /server/fedora/config/etc/httpd/conf.d/vhosts-common.conf	(revision 244)
@@ -0,0 +1,2 @@
+# This file will be included inside each <VirtualHost *:80> block.
+
Index: /server/fedora/config/etc/httpd/conf/httpd.conf
===================================================================
--- /server/fedora/config/etc/httpd/conf/httpd.conf	(revision 243)
+++ /server/fedora/config/etc/httpd/conf/httpd.conf	(revision 244)
@@ -293,4 +293,5 @@
 	ServerName vhosts.mit.edu
 	DocumentRoot /afs/athena.mit.edu/contrib/scripts/vhosts/server.php
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
@@ -302,4 +303,5 @@
 	UserDir web_scripts
 	RewriteEngine Off
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
@@ -313,7 +315,8 @@
 	Alias /src /afs/athena.mit.edu/contrib/scripts/src
 	Redirect /sql https://scripts.mit.edu/~sql
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<IfModule mod_ssl.c>
+<IfModule ssl_module>
 	Listen 443
 
@@ -340,10 +343,8 @@
 		UserDir web_scripts
 		RewriteEngine Off
-		SSLEngine on
+		Include conf.d/vhosts-common-ssl.conf
 		SSLCertificateFile /etc/pki/tls/certs/scripts-cert-new.pem
 		SSLVerifyClient require
 		SSLVerifyDepth 1
-		SSLOptions +StdEnvVars
-		KeepAlive Off
 	</VirtualHost>
 	<VirtualHost *:443>
@@ -352,6 +353,5 @@
 		DocumentRoot /afs/athena.mit.edu/contrib/scripts/vhosts/server.php
 		RewriteEngine Off
-		SSLEngine on
-		KeepAlive Off
+		Include conf.d/vhosts-common-ssl.conf
 	</VirtualHost>
 	<VirtualHost *:443>
@@ -362,6 +362,5 @@
 		UserDir web_scripts
 		RewriteEngine Off
-		SSLEngine on
-		KeepAlive Off
+		Include conf.d/vhosts-common-ssl.conf
 	</VirtualHost>
 </IfModule>
Index: /vhosts/conf.d/11.306.conf
===================================================================
--- /vhosts/conf.d/11.306.conf	(revision 243)
+++ /vhosts/conf.d/11.306.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/course/11/11.306/web_scripts
 	SuExecUserGroup 11.306 11.306
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName shenzhen.mit.edu
-	ServerAlias shenzhen
-	DocumentRoot /afs/athena.mit.edu/course/11/11.306/web_scripts
-	SuExecUserGroup 11.306 11.306
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName shenzhen.mit.edu
+		ServerAlias shenzhen
+		DocumentRoot /afs/athena.mit.edu/course/11/11.306/web_scripts
+		SuExecUserGroup 11.306 11.306
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/11.439.conf
===================================================================
--- /vhosts/conf.d/11.439.conf	(revision 243)
+++ /vhosts/conf.d/11.439.conf	(revision 244)
@@ -6,13 +6,14 @@
 	DocumentRoot /afs/athena.mit.edu/course/11/11.439/web_scripts/blog
 	SuExecUserGroup 11.439 11.439
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName broadstreet.mit.edu
-	ServerAlias broadstreet
-	DocumentRoot /afs/athena.mit.edu/course/11/11.439/web_scripts/blog
-	SuExecUserGroup 11.439 11.439
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName broadstreet.mit.edu
+		ServerAlias broadstreet
+		DocumentRoot /afs/athena.mit.edu/course/11/11.439/web_scripts/blog
+		SuExecUserGroup 11.439 11.439
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/13.704.conf
===================================================================
--- /vhosts/conf.d/13.704.conf	(revision 243)
+++ /vhosts/conf.d/13.704.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/course/13/13.704/web_scripts
 	SuExecUserGroup 13.704 13.704
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName rov.mit.edu
-	ServerAlias rov
-	DocumentRoot /afs/athena.mit.edu/course/13/13.704/web_scripts
-	SuExecUserGroup 13.704 13.704
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName rov.mit.edu
+		ServerAlias rov
+		DocumentRoot /afs/athena.mit.edu/course/13/13.704/web_scripts
+		SuExecUserGroup 13.704 13.704
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/6.034.conf
===================================================================
--- /vhosts/conf.d/6.034.conf	(revision 243)
+++ /vhosts/conf.d/6.034.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/course/6/6.034/web_scripts
 	SuExecUserGroup 6.034 6.034
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName ai6034.mit.edu
-	ServerAlias ai6034
-	DocumentRoot /afs/athena.mit.edu/course/6/6.034/web_scripts
-	SuExecUserGroup 6.034 6.034
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName ai6034.mit.edu
+		ServerAlias ai6034
+		DocumentRoot /afs/athena.mit.edu/course/6/6.034/web_scripts
+		SuExecUserGroup 6.034 6.034
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/6.186.conf
===================================================================
--- /vhosts/conf.d/6.186.conf	(revision 243)
+++ /vhosts/conf.d/6.186.conf	(revision 244)
@@ -4,13 +4,14 @@
 	SuExecUserGroup 6.186 6.186
 	DocumentRoot /afs/athena.mit.edu/course/6/6.186/web_scripts
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName maslab.mit.edu
-	ServerAlias maslab
-	SuExecUserGroup 6.186 6.186
-	DocumentRoot /afs/athena.mit.edu/course/6/6.186/web_scripts
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName maslab.mit.edu
+		ServerAlias maslab
+		SuExecUserGroup 6.186 6.186
+		DocumentRoot /afs/athena.mit.edu/course/6/6.186/web_scripts
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/africans.conf
===================================================================
--- /vhosts/conf.d/africans.conf	(revision 243)
+++ /vhosts/conf.d/africans.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/activity/a/africans/web_scripts
 	SuExecUserGroup africans africans
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName africans.mit.edu
-	ServerAlias africans
-	DocumentRoot /afs/athena.mit.edu/activity/a/africans/web_scripts
-	SuExecUserGroup africans africans
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName africans.mit.edu
+		ServerAlias africans
+		DocumentRoot /afs/athena.mit.edu/activity/a/africans/web_scripts
+		SuExecUserGroup africans africans
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/amirh.conf
===================================================================
--- /vhosts/conf.d/amirh.conf	(revision 243)
+++ /vhosts/conf.d/amirh.conf	(revision 244)
@@ -4,4 +4,5 @@
 	DocumentRoot /afs/athena.mit.edu/user/a/m/amirh/web_scripts/amirhirsch.com
 	SuExecUserGroup amirh amirh
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
@@ -11,4 +12,5 @@
 	DocumentRoot /afs/athena.mit.edu/user/a/m/amirh/web_scripts/fpgawiki.com
 	SuExecUserGroup amirh amirh
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
@@ -18,4 +20,5 @@
 	DocumentRoot /afs/athena.mit.edu/user/a/m/amirh/web_scripts/ctofpga.com
 	SuExecUserGroup amirh amirh
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
@@ -25,4 +28,5 @@
 	DocumentRoot /afs/athena.mit.edu/user/a/m/amirh/web_scripts/facebookake.com
 	SuExecUserGroup amirh amirh
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
@@ -32,3 +36,4 @@
 	DocumentRoot /afs/athena.mit.edu/user/a/m/amirh/web_scripts/catalystac
 	SuExecUserGroup amirh amirh
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
Index: /vhosts/conf.d/apr.conf
===================================================================
--- /vhosts/conf.d/apr.conf	(revision 243)
+++ /vhosts/conf.d/apr.conf	(revision 244)
@@ -6,13 +6,14 @@
 	DocumentRoot /afs/athena.mit.edu/activity/a/apr/web_scripts
 	SuExecUserGroup apr apr
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName prcharvard.mit.edu
-	ServerAlias prcharvard
-	DocumentRoot /afs/athena.mit.edu/activity/a/apr/web_scripts
-	SuExecUserGroup apr apr
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName prcharvard.mit.edu
+		ServerAlias prcharvard
+		DocumentRoot /afs/athena.mit.edu/activity/a/apr/web_scripts
+		SuExecUserGroup apr apr
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/aresnick.conf
===================================================================
--- /vhosts/conf.d/aresnick.conf	(revision 243)
+++ /vhosts/conf.d/aresnick.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/user/a/r/aresnick/web_scripts/stimulant
 	SuExecUserGroup aresnick aresnick
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName stimulant.mit.edu
-	ServerAlias stimulant
-	DocumentRoot /afs/athena.mit.edu/user/a/r/aresnick/web_scripts/stimulant
-	SuExecUserGroup aresnick aresnick
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName stimulant.mit.edu
+		ServerAlias stimulant
+		DocumentRoot /afs/athena.mit.edu/user/a/r/aresnick/web_scripts/stimulant
+		SuExecUserGroup aresnick aresnick
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/arosado.conf
===================================================================
--- /vhosts/conf.d/arosado.conf	(revision 243)
+++ /vhosts/conf.d/arosado.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/user/a/r/arosado/web_scripts
 	SuExecUserGroup arosado arosado
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName arosado.mit.edu
-	ServerAlias arosado
-	DocumentRoot /afs/athena.mit.edu/user/a/r/arosado/web_scripts
-	SuExecUserGroup arosado arosado
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName arosado.mit.edu
+		ServerAlias arosado
+		DocumentRoot /afs/athena.mit.edu/user/a/r/arosado/web_scripts
+		SuExecUserGroup arosado arosado
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/ashdown.conf
===================================================================
--- /vhosts/conf.d/ashdown.conf	(revision 243)
+++ /vhosts/conf.d/ashdown.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/activity/a/ashdown/web_scripts
 	SuExecUserGroup ashdown ashdown
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName ashdown.mit.edu
-	ServerAlias ashdown
-	DocumentRoot /afs/athena.mit.edu/activity/a/ashdown/web_scripts
-	SuExecUserGroup ashdown ashdown
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName ashdown.mit.edu
+		ServerAlias ashdown
+		DocumentRoot /afs/athena.mit.edu/activity/a/ashdown/web_scripts
+		SuExecUserGroup ashdown ashdown
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/aslitwin.conf
===================================================================
--- /vhosts/conf.d/aslitwin.conf	(revision 243)
+++ /vhosts/conf.d/aslitwin.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/user/a/s/aslitwin/web_scripts/blog
 	SuExecUserGroup aslitwin aslitwin
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName itandwork.mit.edu
-	ServerAlias itandwork
-	DocumentRoot /afs/athena.mit.edu/user/a/s/aslitwin/web_scripts/blog
-	SuExecUserGroup aslitwin aslitwin
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName itandwork.mit.edu
+		ServerAlias itandwork
+		DocumentRoot /afs/athena.mit.edu/user/a/s/aslitwin/web_scripts/blog
+		SuExecUserGroup aslitwin aslitwin
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/bgelb.conf
===================================================================
--- /vhosts/conf.d/bgelb.conf	(revision 243)
+++ /vhosts/conf.d/bgelb.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/user/b/g/bgelb/web_scripts/dstar
 	SuExecUserGroup bgelb bgelb
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName d-star.mit.edu
-	ServerAlias d-star
-	DocumentRoot /afs/athena.mit.edu/user/b/g/bgelb/web_scripts/dstar
-	SuExecUserGroup bgelb bgelb
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName d-star.mit.edu
+		ServerAlias d-star
+		DocumentRoot /afs/athena.mit.edu/user/b/g/bgelb/web_scripts/dstar
+		SuExecUserGroup bgelb bgelb
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/cbayley.conf
===================================================================
--- /vhosts/conf.d/cbayley.conf	(revision 243)
+++ /vhosts/conf.d/cbayley.conf	(revision 244)
@@ -4,13 +4,14 @@
 	SuExecUserGroup cbayley cbayley
 	DocumentRoot /afs/athena.mit.edu/user/c/b/cbayley/web_scripts
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName thursdaymorning.mit.edu
-	ServerAlias thursdaymorning
-	SuExecUserGroup cbayley cbayley
-	DocumentRoot /afs/athena.mit.edu/user/c/b/cbayley/web_scripts
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName thursdaymorning.mit.edu
+		ServerAlias thursdaymorning
+		SuExecUserGroup cbayley cbayley
+		DocumentRoot /afs/athena.mit.edu/user/c/b/cbayley/web_scripts
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/dancetroupe.conf
===================================================================
--- /vhosts/conf.d/dancetroupe.conf	(revision 243)
+++ /vhosts/conf.d/dancetroupe.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/activity/d/dancetroupe/web_scripts
 	SuExecUserGroup dancetroupe dancetroupe
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName dancetroupe.mit.edu
-	ServerAlias dancetroupe
-	DocumentRoot /afs/athena.mit.edu/activity/d/dancetroupe/web_scripts
-	SuExecUserGroup dancetroupe dancetroupe
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName dancetroupe.mit.edu
+		ServerAlias dancetroupe
+		DocumentRoot /afs/athena.mit.edu/activity/d/dancetroupe/web_scripts
+		SuExecUserGroup dancetroupe dancetroupe
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/djq.conf
===================================================================
--- /vhosts/conf.d/djq.conf	(revision 243)
+++ /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>
Index: /vhosts/conf.d/erc2007.conf
===================================================================
--- /vhosts/conf.d/erc2007.conf	(revision 243)
+++ /vhosts/conf.d/erc2007.conf	(revision 244)
@@ -6,13 +6,14 @@
 	DocumentRoot /afs/athena.mit.edu/org/e/erc2007/web_scripts/bio
 	SuExecUserGroup erc2007 erc2007
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName erc2007.mit.edu
-	ServerAlias erc2007
-	DocumentRoot /afs/athena.mit.edu/org/e/erc2007/web_scripts/bio
-	SuExecUserGroup erc2007 erc2007
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName erc2007.mit.edu
+		ServerAlias erc2007
+		DocumentRoot /afs/athena.mit.edu/org/e/erc2007/web_scripts/bio
+		SuExecUserGroup erc2007 erc2007
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/francophone.conf
===================================================================
--- /vhosts/conf.d/francophone.conf	(revision 243)
+++ /vhosts/conf.d/francophone.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/activity/f/francophone/web_scripts/total-sailing
 	SuExecUserGroup francophone francophone
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName total-sailing.mit.edu
-	ServerAlias total-sailing
-	DocumentRoot /afs/athena.mit.edu/activity/f/francophone/web_scripts/total-sailing
-	SuExecUserGroup francophone francophone
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName total-sailing.mit.edu
+		ServerAlias total-sailing
+		DocumentRoot /afs/athena.mit.edu/activity/f/francophone/web_scripts/total-sailing
+		SuExecUserGroup francophone francophone
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/geofft.conf
===================================================================
--- /vhosts/conf.d/geofft.conf	(revision 243)
+++ /vhosts/conf.d/geofft.conf	(revision 244)
@@ -6,13 +6,14 @@
 	DocumentRoot /afs/athena.mit.edu/user/g/e/geofft/web_scripts/geofft
 	SuExecUserGroup geofft geofft
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName geofft.mit.edu
-	ServerAlias geofft
-	DocumentRoot /afs/athena.mit.edu/user/g/e/geofft/web_scripts/geofft
-	SuExecUserGroup geofft geofft
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName geofft.mit.edu
+		ServerAlias geofft
+		DocumentRoot /afs/athena.mit.edu/user/g/e/geofft/web_scripts/geofft
+		SuExecUserGroup geofft geofft
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/hkssmit.conf
===================================================================
--- /vhosts/conf.d/hkssmit.conf	(revision 243)
+++ /vhosts/conf.d/hkssmit.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/activity/h/hkssmit/web_scripts
 	SuExecUserGroup hkssmit hkssmit
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName hkss.mit.edu
-	ServerAlias hkss
-	DocumentRoot /afs/athena.mit.edu/activity/h/hkssmit/web_scripts
-	SuExecUserGroup hkssmit hkssmit
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName hkss.mit.edu
+		ServerAlias hkss
+		DocumentRoot /afs/athena.mit.edu/activity/h/hkssmit/web_scripts
+		SuExecUserGroup hkssmit hkssmit
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/hmmt.conf
===================================================================
--- /vhosts/conf.d/hmmt.conf	(revision 243)
+++ /vhosts/conf.d/hmmt.conf	(revision 244)
@@ -4,13 +4,14 @@
 	SuExecUserGroup hmmt hmmt
 	DocumentRoot /afs/athena.mit.edu/org/h/hmmt/web_scripts
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName hmmt.mit.edu
-	ServerAlias hmmt
-	SuExecUserGroup hmmt hmmt
-	DocumentRoot /afs/athena.mit.edu/org/h/hmmt/web_scripts
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName hmmt.mit.edu
+		ServerAlias hmmt
+		SuExecUserGroup hmmt hmmt
+		DocumentRoot /afs/athena.mit.edu/org/h/hmmt/web_scripts
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/imobilare.conf
===================================================================
--- /vhosts/conf.d/imobilare.conf	(revision 243)
+++ /vhosts/conf.d/imobilare.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/activity/i/imobilare/web_scripts
 	SuExecUserGroup imobilare imobilare
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName imobilare.mit.edu
-	ServerAlias imobilare
-	DocumentRoot /afs/athena.mit.edu/activity/i/imobilare/web_scripts
-	SuExecUserGroup imobilare imobilare
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName imobilare.mit.edu
+		ServerAlias imobilare
+		DocumentRoot /afs/athena.mit.edu/activity/i/imobilare/web_scripts
+		SuExecUserGroup imobilare imobilare
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/isaacdlp.conf
===================================================================
--- /vhosts/conf.d/isaacdlp.conf	(revision 243)
+++ /vhosts/conf.d/isaacdlp.conf	(revision 244)
@@ -4,15 +4,16 @@
 	DocumentRoot /afs/athena.mit.edu/user/i/s/isaacdlp/web_scripts
 	SuExecUserGroup isaacdlp isaacdlp
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName isaacdlp.mit.edu
-	ServerAlias isaacdlp
-	DocumentRoot /afs/athena.mit.edu/user/i/s/isaacdlp/web_scripts
-	SuExecUserGroup isaacdlp isaacdlp
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName isaacdlp.mit.edu
+		ServerAlias isaacdlp
+		DocumentRoot /afs/athena.mit.edu/user/i/s/isaacdlp/web_scripts
+		SuExecUserGroup isaacdlp isaacdlp
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
 
 <VirtualHost *:80>
@@ -21,13 +22,14 @@
 	DocumentRoot /afs/athena.mit.edu/user/i/s/isaacdlp/web_scripts
 	SuExecUserGroup isaacdlp isaacdlp
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName sloanfellows.mit.edu
-	ServerAlias sloanfellows
-	DocumentRoot /afs/athena.mit.edu/user/i/s/isaacdlp/web_scripts
-	SuExecUserGroup isaacdlp isaacdlp
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName sloanfellows.mit.edu
+		ServerAlias sloanfellows
+		DocumentRoot /afs/athena.mit.edu/user/i/s/isaacdlp/web_scripts
+		SuExecUserGroup isaacdlp isaacdlp
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/jbarnold.conf
===================================================================
--- /vhosts/conf.d/jbarnold.conf	(revision 243)
+++ /vhosts/conf.d/jbarnold.conf	(revision 244)
@@ -8,13 +8,14 @@
 	ScriptAlias / /mit/jbarnold/web_scripts/scripts-rt/bin/mason_handler.fcgi/
 	Alias /NoAuth/images/ /mit/jbarnold/web_scripts/scripts-rt/share/html/NoAuth/images/
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName reminder.mit.edu
-	ServerAlias reminder
-	DocumentRoot /afs/athena.mit.edu/user/j/b/jbarnold/web_scripts/scripts-rt
-	SuExecUserGroup jbarnold jbarnold
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName reminder.mit.edu
+		ServerAlias reminder
+		DocumentRoot /afs/athena.mit.edu/user/j/b/jbarnold/web_scripts/scripts-rt
+		SuExecUserGroup jbarnold jbarnold
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/linerva.conf
===================================================================
--- /vhosts/conf.d/linerva.conf	(revision 243)
+++ /vhosts/conf.d/linerva.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/sipb.mit.edu/project/linerva/web_scripts
 	SuExecUserGroup linerva linerva
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName linerva.mit.edu
-	ServerAlias linerva linux-dialup.mit.edu linux-dialup linux.mit.edu linux not-slowlaris.mit.edu not-slowlaris
-	DocumentRoot /afs/sipb.mit.edu/project/linerva/web_scripts
-	SuExecUserGroup linerva linerva
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName linerva.mit.edu
+		ServerAlias linerva linux-dialup.mit.edu linux-dialup linux.mit.edu linux not-slowlaris.mit.edu not-slowlaris
+		DocumentRoot /afs/sipb.mit.edu/project/linerva/web_scripts
+		SuExecUserGroup linerva linerva
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/manas.conf
===================================================================
--- /vhosts/conf.d/manas.conf	(revision 243)
+++ /vhosts/conf.d/manas.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/user/m/a/manas/web_scripts/talks
 	SuExecUserGroup manas manas
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName talks.mit.edu
-	ServerAlias talks
-	DocumentRoot /afs/athena.mit.edu/user/m/a/manas/web_scripts/talks
-	SuExecUserGroup manas manas
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName talks.mit.edu
+		ServerAlias talks
+		DocumentRoot /afs/athena.mit.edu/user/m/a/manas/web_scripts/talks
+		SuExecUserGroup manas manas
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/mathmike.conf
===================================================================
--- /vhosts/conf.d/mathmike.conf	(revision 243)
+++ /vhosts/conf.d/mathmike.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/user/m/a/mathmike/web_scripts/course
 	SuExecUserGroup mathmike mathmike
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName course.mit.edu
-	ServerAlias course
-	DocumentRoot /afs/athena.mit.edu/user/m/a/mathmike/web_scripts/course
-	SuExecUserGroup mathmike mathmike
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName course.mit.edu
+		ServerAlias course
+		DocumentRoot /afs/athena.mit.edu/user/m/a/mathmike/web_scripts/course
+		SuExecUserGroup mathmike mathmike
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/mitcrew.conf
===================================================================
--- /vhosts/conf.d/mitcrew.conf	(revision 243)
+++ /vhosts/conf.d/mitcrew.conf	(revision 244)
@@ -5,13 +5,14 @@
 	SuExecUserGroup mitcrew mitcrew
 	Redirect / https://scripts-cert.mit.edu/~mitcrew/
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName mitcrew.mit.edu
-	ServerAlias mitcrew
-	DocumentRoot /afs/athena.mit.edu/activity/m/mitcrew/web_scripts
-	SuExecUserGroup mitcrew mitcrew
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName mitcrew.mit.edu
+		ServerAlias mitcrew
+		DocumentRoot /afs/athena.mit.edu/activity/m/mitcrew/web_scripts
+		SuExecUserGroup mitcrew mitcrew
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/mstgroup.conf
===================================================================
--- /vhosts/conf.d/mstgroup.conf	(revision 243)
+++ /vhosts/conf.d/mstgroup.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/org/m/mstgroup/web_scripts
 	SuExecUserGroup mstgroup mstgroup
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName mstgroup.mit.edu
-	ServerAlias mstgroup
-	DocumentRoot /afs/athena.mit.edu/org/m/mstgroup/web_scripts
-	SuExecUserGroup mstgroup mstgroup
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName mstgroup.mit.edu
+		ServerAlias mstgroup
+		DocumentRoot /afs/athena.mit.edu/org/m/mstgroup/web_scripts
+		SuExecUserGroup mstgroup mstgroup
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/mujde.conf
===================================================================
--- /vhosts/conf.d/mujde.conf	(revision 243)
+++ /vhosts/conf.d/mujde.conf	(revision 244)
@@ -6,13 +6,14 @@
 	DocumentRoot /afs/athena.mit.edu/user/m/u/mujde/web_scripts/morpheus
 	SuExecUserGroup mujde mujde
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName themorpheus.mit.edu
-	ServerAlias themorpheus
-	DocumentRoot /afs/athena.mit.edu/user/m/u/mujde/web_scripts/morpheus
-	SuExecUserGroup mujde mujde
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName themorpheus.mit.edu
+		ServerAlias themorpheus
+		DocumentRoot /afs/athena.mit.edu/user/m/u/mujde/web_scripts/morpheus
+		SuExecUserGroup mujde mujde
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/petron.conf
===================================================================
--- /vhosts/conf.d/petron.conf	(revision 243)
+++ /vhosts/conf.d/petron.conf	(revision 244)
@@ -6,13 +6,14 @@
 	DocumentRoot /afs/athena.mit.edu/user/p/e/petron/web_scripts/www
 	SuExecUserGroup petron petron
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName darthur.mit.edu
-	ServerAlias darthur
-	DocumentRoot /afs/athena.mit.edu/user/p/e/petron/web_scripts/www
-	SuExecUserGroup petron petron
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName darthur.mit.edu
+		ServerAlias darthur
+		DocumentRoot /afs/athena.mit.edu/user/p/e/petron/web_scripts/www
+		SuExecUserGroup petron petron
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/physics-gsc.conf
===================================================================
--- /vhosts/conf.d/physics-gsc.conf	(revision 243)
+++ /vhosts/conf.d/physics-gsc.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/activity/p/physics-gsc/web_scripts/joomla
 	SuExecUserGroup physics-gsc physics-gsc
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName pgsc.mit.edu
-	ServerAlias pgsc
-	DocumentRoot /afs/athena.mit.edu/activity/p/physics-gsc/web_scripts/joomla
-	SuExecUserGroup physics-gsc physics-gsc
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName pgsc.mit.edu
+		ServerAlias pgsc
+		DocumentRoot /afs/athena.mit.edu/activity/p/physics-gsc/web_scripts/joomla
+		SuExecUserGroup physics-gsc physics-gsc
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/presbrey.conf
===================================================================
--- /vhosts/conf.d/presbrey.conf	(revision 243)
+++ /vhosts/conf.d/presbrey.conf	(revision 244)
@@ -3,14 +3,15 @@
 	DocumentRoot /afs/athena.mit.edu/user/p/r/presbrey/web_scripts
 	SuExecUserGroup presbrey presbrey
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName presbrey.mit.edu
-	DocumentRoot /afs/athena.mit.edu/user/p/r/presbrey/web_scripts
-	SuExecUserGroup presbrey presbrey
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName presbrey.mit.edu
+		DocumentRoot /afs/athena.mit.edu/user/p/r/presbrey/web_scripts
+		SuExecUserGroup presbrey presbrey
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
 
 <VirtualHost *:80>
@@ -18,12 +19,13 @@
 	DocumentRoot /afs/athena.mit.edu/user/p/r/presbrey/web_scripts/sites/scripts.presbrey.net
 	SuExecUserGroup presbrey presbrey
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName scripts.presbrey.net
-	DocumentRoot /afs/athena.mit.edu/user/p/r/presbrey/web_scripts/sites/scripts.presbrey.net
-	SuExecUserGroup presbrey presbrey
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName scripts.presbrey.net
+		DocumentRoot /afs/athena.mit.edu/user/p/r/presbrey/web_scripts/sites/scripts.presbrey.net
+		SuExecUserGroup presbrey presbrey
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/putz.conf
===================================================================
--- /vhosts/conf.d/putz.conf	(revision 243)
+++ /vhosts/conf.d/putz.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/activity/p/putz/web_scripts
 	SuExecUserGroup putz putz
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName putz.mit.edu
-	ServerAlias putz
-	DocumentRoot /afs/athena.mit.edu/activity/p/putz/web_scripts
-	SuExecUserGroup putz putz
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName putz.mit.edu
+		ServerAlias putz
+		DocumentRoot /afs/athena.mit.edu/activity/p/putz/web_scripts
+		SuExecUserGroup putz putz
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/quickprint.conf
===================================================================
--- /vhosts/conf.d/quickprint.conf	(revision 243)
+++ /vhosts/conf.d/quickprint.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/sipb.mit.edu/project/quickprint/web_scripts/root
 	SuExecUserGroup quickprint quickprint
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName quickprint.mit.edu
-	ServerAlias quickprint
-	DocumentRoot /afs/sipb.mit.edu/project/quickprint/web_scripts/root
-	SuExecUserGroup quickprint quickprint
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName quickprint.mit.edu
+		ServerAlias quickprint
+		DocumentRoot /afs/sipb.mit.edu/project/quickprint/web_scripts/root
+		SuExecUserGroup quickprint quickprint
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/random-hall.conf
===================================================================
--- /vhosts/conf.d/random-hall.conf	(revision 243)
+++ /vhosts/conf.d/random-hall.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/activity/r/random-hall/web_scripts
 	SuExecUserGroup random-hall random-hall
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName random-hall.mit.edu
-	ServerAlias random-hall
-	DocumentRoot /afs/athena.mit.edu/activity/r/random-hall/web_scripts
-	SuExecUserGroup random-hall random-hall
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName random-hall.mit.edu
+		ServerAlias random-hall
+		DocumentRoot /afs/athena.mit.edu/activity/r/random-hall/web_scripts
+		SuExecUserGroup random-hall random-hall
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/repl.conf
===================================================================
--- /vhosts/conf.d/repl.conf	(revision 243)
+++ /vhosts/conf.d/repl.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/sipb.mit.edu/project/repl/web_scripts
 	SuExecUserGroup repl repl
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName distributedajax.com
-	ServerAlias www.distributedajax.com *.distributedajax.com
-	DocumentRoot /afs/sipb.mit.edu/project/repl/web_scripts
-	SuExecUserGroup repl repl
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName distributedajax.com
+		ServerAlias www.distributedajax.com *.distributedajax.com
+		DocumentRoot /afs/sipb.mit.edu/project/repl/web_scripts
+		SuExecUserGroup repl repl
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/reuter.conf
===================================================================
--- /vhosts/conf.d/reuter.conf	(revision 243)
+++ /vhosts/conf.d/reuter.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/user/r/e/reuter/web_scripts
 	SuExecUserGroup reuter reuter
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName reuter.mit.edu
-	ServerAlias reuter
-	DocumentRoot /afs/athena.mit.edu/user/r/e/reuter/web_scripts
-	SuExecUserGroup reuter reuter
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName reuter.mit.edu
+		ServerAlias reuter
+		DocumentRoot /afs/athena.mit.edu/user/r/e/reuter/web_scripts
+		SuExecUserGroup reuter reuter
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/rocsa.conf
===================================================================
--- /vhosts/conf.d/rocsa.conf	(revision 243)
+++ /vhosts/conf.d/rocsa.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/activity/r/rocsa/web_scripts
 	SuExecUserGroup rocsa rocsa
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName rocsa.mit.edu
-	ServerAlias rocsa
-	DocumentRoot /afs/athena.mit.edu/activity/r/rocsa/web_scripts
-	SuExecUserGroup rocsa rocsa
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName rocsa.mit.edu
+		ServerAlias rocsa
+		DocumentRoot /afs/athena.mit.edu/activity/r/rocsa/web_scripts
+		SuExecUserGroup rocsa rocsa
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/sastry.conf
===================================================================
--- /vhosts/conf.d/sastry.conf	(revision 243)
+++ /vhosts/conf.d/sastry.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/user/s/a/sastry/web_scripts/990wiki
 	SuExecUserGroup sastry sastry
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName pmclass.mit.edu
-	ServerAlias pmclass
-	DocumentRoot /afs/athena.mit.edu/user/s/a/sastry/web_scripts/990wiki
-	SuExecUserGroup sastry sastry
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName pmclass.mit.edu
+		ServerAlias pmclass
+		DocumentRoot /afs/athena.mit.edu/user/s/a/sastry/web_scripts/990wiki
+		SuExecUserGroup sastry sastry
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/sloan.conf
===================================================================
--- /vhosts/conf.d/sloan.conf	(revision 243)
+++ /vhosts/conf.d/sloan.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/org/s/sloan/web_scripts
 	SuExecUserGroup sloan sloan
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName sloanapps.mit.edu
-	ServerAlias sloanapps
-	DocumentRoot /afs/athena.mit.edu/org/s/sloan/web_scripts
-	SuExecUserGroup sloan sloan
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName sloanapps.mit.edu
+		ServerAlias sloanapps
+		DocumentRoot /afs/athena.mit.edu/org/s/sloan/web_scripts
+		SuExecUserGroup sloan sloan
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/sql.conf
===================================================================
--- /vhosts/conf.d/sql.conf	(revision 243)
+++ /vhosts/conf.d/sql.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/contrib/sql/web_scripts/home
 	SuExecUserGroup sql sql
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName sql.mit.edu
-	ServerAlias sql
-	DocumentRoot /afs/athena.mit.edu/contrib/sql/web_scripts/home
-	SuExecUserGroup sql sql
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName sql.mit.edu
+		ServerAlias sql
+		DocumentRoot /afs/athena.mit.edu/contrib/sql/web_scripts/home
+		SuExecUserGroup sql sql
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/strategic.conf
===================================================================
--- /vhosts/conf.d/strategic.conf	(revision 243)
+++ /vhosts/conf.d/strategic.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/org/s/strategic/web_scripts/strategicengineering
 	SuExecUserGroup strategic strategic
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName strategic.mit.edu
-	ServerAlias strategic
-	DocumentRoot /afs/athena.mit.edu/org/s/strategic/web_scripts/strategicengineering
-	SuExecUserGroup strategic strategic
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName strategic.mit.edu
+		ServerAlias strategic
+		DocumentRoot /afs/athena.mit.edu/org/s/strategic/web_scripts/strategicengineering
+		SuExecUserGroup strategic strategic
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/sustainability.conf
===================================================================
--- /vhosts/conf.d/sustainability.conf	(revision 243)
+++ /vhosts/conf.d/sustainability.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/org/s/sustainability/web_scripts
 	SuExecUserGroup sustainability sustainability
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName sustainability.mit.edu
-	ServerAlias sustainability
-	DocumentRoot /afs/athena.mit.edu/org/s/sustainability/web_scripts
-	SuExecUserGroup sustainability sustainability
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName sustainability.mit.edu
+		ServerAlias sustainability
+		DocumentRoot /afs/athena.mit.edu/org/s/sustainability/web_scripts
+		SuExecUserGroup sustainability sustainability
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/taalebi.conf
===================================================================
--- /vhosts/conf.d/taalebi.conf	(revision 243)
+++ /vhosts/conf.d/taalebi.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/user/t/a/taalebi/web_scripts
 	SuExecUserGroup taalebi taalebi
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName shirin.mit.edu
-	ServerAlias shirin
-	DocumentRoot /afs/athena.mit.edu/user/t/a/taalebi/web_scripts
-	SuExecUserGroup taalebi taalebi
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName shirin.mit.edu
+		ServerAlias shirin
+		DocumentRoot /afs/athena.mit.edu/user/t/a/taalebi/web_scripts
+		SuExecUserGroup taalebi taalebi
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/tdc.conf
===================================================================
--- /vhosts/conf.d/tdc.conf	(revision 243)
+++ /vhosts/conf.d/tdc.conf	(revision 244)
@@ -4,15 +4,16 @@
 	DocumentRoot /afs/athena.mit.edu/activity/t/tdc/web_scripts
 	SuExecUserGroup tdc tdc
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName tdc.mit.edu
-	ServerAlias tdc
-	DocumentRoot /afs/athena.mit.edu/activity/t/tdc/web_scripts
-	SuExecUserGroup tdc tdc
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName tdc.mit.edu
+		ServerAlias tdc
+		DocumentRoot /afs/athena.mit.edu/activity/t/tdc/web_scripts
+		SuExecUserGroup tdc tdc
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
 
 <VirtualHost *:80>
@@ -21,3 +22,4 @@
 	DocumentRoot /afs/athena.mit.edu/activity/t/tdc/web_scripts/facebook
 	SuExecUserGroup tdc tdc
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
Index: /vhosts/conf.d/tor.conf
===================================================================
--- /vhosts/conf.d/tor.conf	(revision 243)
+++ /vhosts/conf.d/tor.conf	(revision 244)
@@ -5,14 +5,15 @@
 	SuExecUserGroup tor tor
 	ErrorLog /dev/null
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName sipb-tor.mit.edu
-	ServerAlias sipb-tor 18.187.1.68
-	DocumentRoot /afs/sipb.mit.edu/project/tor/web_scripts
-	SuExecUserGroup tor tor
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-	ErrorLog /dev/null
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName sipb-tor.mit.edu
+		ServerAlias sipb-tor 18.187.1.68
+		DocumentRoot /afs/sipb.mit.edu/project/tor/web_scripts
+		SuExecUserGroup tor tor
+		Include conf.d/vhosts-common-ssl.conf
+		ErrorLog /dev/null
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/tural.conf
===================================================================
--- /vhosts/conf.d/tural.conf	(revision 243)
+++ /vhosts/conf.d/tural.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/user/t/u/turalb/web_scripts
 	SuExecUserGroup turalb turalb
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName tural.mit.edu
-	ServerAlias tural
-	DocumentRoot /afs/athena.mit.edu/user/t/u/turalb/web_scripts
-	SuExecUserGroup turalb turalb
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName tural.mit.edu
+		ServerAlias tural
+		DocumentRoot /afs/athena.mit.edu/user/t/u/turalb/web_scripts
+		SuExecUserGroup turalb turalb
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/tzg.conf
===================================================================
--- /vhosts/conf.d/tzg.conf	(revision 243)
+++ /vhosts/conf.d/tzg.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/user/t/z/tzg/web_scripts/testjoomla
 	SuExecUserGroup tzg tzg
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName yaa.mit.edu
-	ServerAlias yaa
-	DocumentRoot /afs/athena.mit.edu/user/t/z/tzg/web_scripts/testjoomla
-	SuExecUserGroup tzg tzg
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName yaa.mit.edu
+		ServerAlias yaa
+		DocumentRoot /afs/athena.mit.edu/user/t/z/tzg/web_scripts/testjoomla
+		SuExecUserGroup tzg tzg
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/ua.conf
===================================================================
--- /vhosts/conf.d/ua.conf	(revision 243)
+++ /vhosts/conf.d/ua.conf	(revision 244)
@@ -6,13 +6,14 @@
 	DocumentRoot /afs/athena.mit.edu/activity/u/ua/web_scripts/drupal
 	SuExecUserGroup ua ua
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName ua.mit.edu
-	ServerAlias ua
-	DocumentRoot /afs/athena.mit.edu/activity/u/ua/web_scripts/drupal
-	SuExecUserGroup ua ua
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName ua.mit.edu
+		ServerAlias ua
+		DocumentRoot /afs/athena.mit.edu/activity/u/ua/web_scripts/drupal
+		SuExecUserGroup ua ua
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/varun_ag.conf
===================================================================
--- /vhosts/conf.d/varun_ag.conf	(revision 243)
+++ /vhosts/conf.d/varun_ag.conf	(revision 244)
@@ -6,13 +6,14 @@
 	DocumentRoot /afs/athena.mit.edu/user/v/a/varun_ag/web_scripts/circuitopedia
 	SuExecUserGroup varun_ag varun_ag
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName circuitopedia.mit.edu
-	ServerAlias circuitopedia
-	DocumentRoot /afs/athena.mit.edu/user/v/a/varun_ag/web_scripts/circuitopedia
-	SuExecUserGroup varun_ag varun_ag
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName circuitopedia.mit.edu
+		ServerAlias circuitopedia
+		DocumentRoot /afs/athena.mit.edu/user/v/a/varun_ag/web_scripts/circuitopedia
+		SuExecUserGroup varun_ag varun_ag
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/voldman.conf
===================================================================
--- /vhosts/conf.d/voldman.conf	(revision 243)
+++ /vhosts/conf.d/voldman.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/user/v/o/voldman/web_scripts/cyborgmoth
 	SuExecUserGroup voldman voldman
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName cyborgmoth.mit.edu
-	ServerAlias cyborgmoth
-	DocumentRoot /afs/athena.mit.edu/user/v/o/voldman/web_scripts/cyborgmoth
-	SuExecUserGroup voldman voldman
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName cyborgmoth.mit.edu
+		ServerAlias cyborgmoth
+		DocumentRoot /afs/athena.mit.edu/user/v/o/voldman/web_scripts/cyborgmoth
+		SuExecUserGroup voldman voldman
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/yonah.conf
===================================================================
--- /vhosts/conf.d/yonah.conf	(revision 243)
+++ /vhosts/conf.d/yonah.conf	(revision 244)
@@ -4,13 +4,14 @@
 	DocumentRoot /afs/athena.mit.edu/user/y/o/yonah/web_scripts
 	SuExecUserGroup yonah yonah
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName heartsafe.mit.edu
-	ServerAlias heartsafe
-	DocumentRoot /afs/athena.mit.edu/user/y/o/yonah/web_scripts
-	SuExecUserGroup yonah yonah
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName heartsafe.mit.edu
+		ServerAlias heartsafe
+		DocumentRoot /afs/athena.mit.edu/user/y/o/yonah/web_scripts
+		SuExecUserGroup yonah yonah
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: /vhosts/conf.d/zelda.conf
===================================================================
--- /vhosts/conf.d/zelda.conf	(revision 243)
+++ /vhosts/conf.d/zelda.conf	(revision 244)
@@ -4,15 +4,16 @@
 	DocumentRoot /afs/athena.mit.edu/activity/z/zelda/web_scripts
 	SuExecUserGroup zelda zelda
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName pika-baby.mit.edu
-	ServerAlias pika-baby
-	DocumentRoot /afs/athena.mit.edu/activity/z/zelda/web_scripts
-	SuExecUserGroup zelda zelda
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName pika-baby.mit.edu
+		ServerAlias pika-baby
+		DocumentRoot /afs/athena.mit.edu/activity/z/zelda/web_scripts
+		SuExecUserGroup zelda zelda
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
 
 <VirtualHost *:80>
@@ -21,15 +22,16 @@
 	DocumentRoot /afs/athena.mit.edu/activity/z/zelda/web_scripts
 	SuExecUserGroup zelda zelda
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName pika.mit.edu
-	ServerAlias pika
-	DocumentRoot /afs/athena.mit.edu/activity/z/zelda/web_scripts
-	SuExecUserGroup zelda zelda
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName pika.mit.edu
+		ServerAlias pika
+		DocumentRoot /afs/athena.mit.edu/activity/z/zelda/web_scripts
+		SuExecUserGroup zelda zelda
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
 
 <VirtualHost *:80>
@@ -37,14 +39,15 @@
 	DocumentRoot /afs/athena.mit.edu/activity/z/zelda/web_scripts
 	SuExecUserGroup zelda zelda
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName pikans.com
-	DocumentRoot /afs/athena.mit.edu/activity/z/zelda/web_scripts
-	SuExecUserGroup zelda zelda
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName pikans.com
+		DocumentRoot /afs/athena.mit.edu/activity/z/zelda/web_scripts
+		SuExecUserGroup zelda zelda
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
 
 <VirtualHost *:80>
@@ -52,12 +55,13 @@
 	DocumentRoot /afs/athena.mit.edu/activity/z/zelda/web_scripts
 	SuExecUserGroup zelda zelda
+	Include conf.d/vhosts-common.conf
 </VirtualHost>
 
-<VirtualHost *:443>
-	ServerName pikans.org
-	DocumentRoot /afs/athena.mit.edu/activity/z/zelda/web_scripts
-	SuExecUserGroup zelda zelda
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
+<IfModule ssl_module>
+	<VirtualHost *:443>
+		ServerName pikans.org
+		DocumentRoot /afs/athena.mit.edu/activity/z/zelda/web_scripts
+		SuExecUserGroup zelda zelda
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
