Index: server/fedora/config/etc/httpd/conf.d/vhosts-vhost-names.conf
===================================================================
--- server/fedora/config/etc/httpd/conf.d/vhosts-vhost-names.conf	(revision 649)
+++ 	(revision )
@@ -1,2 +1,0 @@
-ServerName vhosts.mit.edu
-ServerAlias aaphotogallery.mit.edu aaphotogallery ats.mit.edu ats bookx.mit.edu bookx bunnyfish.mit.edu bunnyfish cadr.mit.edu cadr cfg-lib.mit.edu cfg-lib diz.mit.edu diz e-entry.mit.edu e-entry eire.mit.edu eire fizzix.mit.edu fizzix fpgacommunity.com www.fpgacommunity.com fpgahpc.com www.fpgahpc.com fpgaos.com www.fpgaos.com fpgasupercomputing.com www.fpgasupercomputing.com hpcfpga.com www.hpcfpga.com isg-lib.mit.edu isg-lib mariachi.mit.edu mariachi nh4.mit.edu nh4 ps3network.org www.ps3network.org rclinux.com www.rclinux.com robots.mit.edu robots scripts1.presbrey.net scripts2.presbrey.net scripts3.presbrey.net torg.mit.edu torg tpss.mit.edu tpss urops.mit.edu urops
Index: server/fedora/config/etc/httpd/conf/httpd.conf
===================================================================
--- server/fedora/config/etc/httpd/conf/httpd.conf	(revision 649)
+++ server/fedora/config/etc/httpd/conf/httpd.conf	(revision 653)
@@ -283,10 +283,4 @@
 </VirtualHost>
 
-<VirtualHost *:80>
-    Include conf.d/vhosts-vhost-names.conf
-    DocumentRoot /afs/athena.mit.edu/contrib/scripts/vhosts/server.php
-    Include conf.d/vhosts-common.conf
-</VirtualHost>
-
 <IfModule ssl_module>
     Listen 443
@@ -335,9 +329,4 @@
         Include conf.d/vhosts-common-ssl.conf
     </VirtualHost>
-    <VirtualHost *:443>
-        Include conf.d/vhosts-vhost-names.conf
-        DocumentRoot /afs/athena.mit.edu/contrib/scripts/vhosts/server.php
-        Include conf.d/vhosts-common-ssl.conf
-    </VirtualHost>
     # LDAP vhost, w00t w00t
     <VirtualHost *:444>
@@ -362,10 +351,4 @@
         Include conf.d/vhosts-common-ssl-cert.conf
     </VirtualHost>
-    <VirtualHost *:444>
-        Include conf.d/vhosts-vhost-names.conf
-        DocumentRoot /afs/athena.mit.edu/contrib/scripts/vhosts/server.php
-        Include conf.d/vhosts-common-ssl.conf
-        Include conf.d/vhosts-common-ssl-cert.conf
-    </VirtualHost>
 </IfModule>