Index: server/fedora/config/etc/httpd/conf.d/scripts-vhost.conf
===================================================================
--- server/fedora/config/etc/httpd/conf.d/scripts-vhost.conf	(revision 330)
+++ server/fedora/config/etc/httpd/conf.d/scripts-vhost.conf	(revision 330)
@@ -0,0 +1,15 @@
+DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
+SuExecUserGroup scripts users
+UserDir web_scripts
+Alias /heartbeat /afs/athena.mit.edu/contrib/scripts/web_scripts/heartbeat
+Alias /src /afs/athena.mit.edu/contrib/scripts/src
+Redirect /sql https://scripts.mit.edu/~sql
+
+<Location ~ "/(robots\.txt|favicon\.ico)">
+    RewriteEngine On
+    RewriteBase /~scripts
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteRule .*(favicon\.ico) $1 [L,NS]
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteRule .*(robots\.txt) $1 [L,NS]
+</Location>
Index: server/fedora/config/etc/httpd/conf/httpd.conf
===================================================================
--- server/fedora/config/etc/httpd/conf/httpd.conf	(revision 325)
+++ server/fedora/config/etc/httpd/conf/httpd.conf	(revision 330)
@@ -245,11 +245,9 @@
 RewriteEngine Off
 
-<Location ~ "/(robots\.txt|favicon\.ico)">
-    RewriteEngine On
-    RewriteBase /~scripts
-    RewriteCond %{REQUEST_FILENAME} !-f
-    RewriteRule .*(favicon\.ico) $1 [L,NS]
-    RewriteCond %{REQUEST_FILENAME} !-f
-    RewriteRule .*(robots\.txt) $1 [L,NS]
+<Location /robots.txt>
+    ErrorDocument 404 "No robots.txt.
+</Location>
+<Location /favicon.ico>
+    ErrorDocument 404 "No favicon.ico.
 </Location>
 
@@ -263,8 +261,5 @@
     ServerName scripts-cert.mit.edu
     ServerAlias scripts-cert
-    DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
-    SuExecUserGroup scripts users
-    UserDir web_scripts
-    Alias /heartbeat /afs/athena.mit.edu/contrib/scripts/web_scripts/heartbeat
+    Include conf.d/scripts-vhost.conf
     Include conf.d/vhosts-common.conf
 </VirtualHost>
@@ -273,10 +268,5 @@
     ServerName scripts.mit.edu
     ServerAlias scripts scripts-test.mit.edu scripts-test 18.181.0.46 18.181.0.57 old-faithful.mit.edu old-faithful scripts3.mit.edu scripts3 18.181.0.53 better-mousetrap.mit.edu better-mousetrap scripts4.mit.edu scripts4
-    DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
-    SuExecUserGroup scripts users
-    UserDir web_scripts
-    Alias /heartbeat /afs/athena.mit.edu/contrib/scripts/web_scripts/heartbeat
-    Alias /src /afs/athena.mit.edu/contrib/scripts/src
-    Redirect /sql https://scripts.mit.edu/~sql
+    Include conf.d/scripts-vhost.conf
     Include conf.d/vhosts-common.conf
 </VirtualHost>
@@ -303,8 +293,5 @@
         ServerName scripts-cert.mit.edu
         ServerAlias scripts-cert
-        DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
-	Alias /heartbeat /afs/athena.mit.edu/contrib/scripts/web_scripts/heartbeat
-        SuExecUserGroup scripts users
-        UserDir web_scripts
+        Include conf.d/scripts-vhost.conf
         Include conf.d/vhosts-common-ssl.conf
         SSLCertificateFile /etc/pki/tls/certs/scripts-cert-new.pem
@@ -320,8 +307,5 @@
         ServerName scripts.mit.edu
         ServerAlias scripts scripts-test.mit.edu scripts-test 18.181.0.46 18.181.0.57 old-faithful.mit.edu old-faithful scripts3.mit.edu scripts3 18.181.0.53 better-mousetrap.mit.edu better-mousetrap scripts4.mit.edu scripts4
-        DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
-        Alias /heartbeat /afs/athena.mit.edu/contrib/scripts/web_scripts/heartbeat
-        SuExecUserGroup scripts users
-        UserDir web_scripts
+        Include conf.d/scripts-vhost.conf
         Include conf.d/vhosts-common-ssl.conf
     </VirtualHost>