Index: /vhosts/conf.d/linerva.conf
===================================================================
--- /vhosts/conf.d/linerva.conf	(revision 218)
+++ /vhosts/conf.d/linerva.conf	(revision 219)
@@ -1,5 +1,5 @@
 <VirtualHost *:80>
 	ServerName linerva.mit.edu
-	ServerAlias linerva
+	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
@@ -8,5 +8,5 @@
 <VirtualHost *:443>
 	ServerName linerva.mit.edu
-	ServerAlias linerva
+	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
@@ -15,53 +15,2 @@
 	</IfModule>
 </VirtualHost>
-
-<VirtualHost *:80>
-	ServerName linux.mit.edu
-	ServerAlias linux
-	DocumentRoot /afs/sipb.mit.edu/project/linerva/web_scripts
-	SuExecUserGroup linerva linerva
-</VirtualHost>
-
-<VirtualHost *:443>
-	ServerName linux.mit.edu
-	ServerAlias linux
-	DocumentRoot /afs/sipb.mit.edu/project/linerva/web_scripts
-	SuExecUserGroup linerva linerva
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
-
-<VirtualHost *:80>
-	ServerName linux-dialup.mit.edu
-	ServerAlias linux-dialup
-	DocumentRoot /afs/sipb.mit.edu/project/linerva/web_scripts
-	SuExecUserGroup linerva linerva
-</VirtualHost>
-
-<VirtualHost *:443>
-	ServerName linux-dialup.mit.edu
-	ServerAlias linux-dialup
-	DocumentRoot /afs/sipb.mit.edu/project/linerva/web_scripts
-	SuExecUserGroup linerva linerva
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>
-
-<VirtualHost *:80>
-	ServerName not-slowlaris.mit.edu
-	ServerAlias not-slowlaris
-	DocumentRoot /afs/sipb.mit.edu/project/linerva/web_scripts
-	SuExecUserGroup linerva linerva
-</VirtualHost>
-
-<VirtualHost *:443>
-	ServerName not-slowlaris.mit.edu
-	ServerAlias not-slowlaris
-	DocumentRoot /afs/sipb.mit.edu/project/linerva/web_scripts
-	SuExecUserGroup linerva linerva
-	<IfModule mod_ssl.c>
-	SSLEngine on
-	</IfModule>
-</VirtualHost>