Index: /server/fedora/config/etc/hosts
===================================================================
--- /server/fedora/config/etc/hosts	(revision 150)
+++ /server/fedora/config/etc/hosts	(revision 151)
@@ -4,4 +4,4 @@
 ::1		localhost.localdomain localhost
 
-18.181.0.46	scripts scripts.mit.edu
-18.181.0.52	sql sql.mit.edu
+18.181.0.46	scripts.mit.edu
+18.181.0.52	sql.mit.edu
Index: /server/fedora/config/etc/httpd/conf/httpd.conf
===================================================================
--- /server/fedora/config/etc/httpd/conf/httpd.conf	(revision 150)
+++ /server/fedora/config/etc/httpd/conf/httpd.conf	(revision 151)
@@ -42,5 +42,5 @@
 LoadModule mime_module modules/mod_mime.so
 #LoadModule dav_module modules/mod_dav.so
-#LoadModule status_module modules/mod_status.so
+LoadModule status_module modules/mod_status.so
 LoadModule autoindex_module modules/mod_autoindex.so
 #LoadModule info_module modules/mod_info.so
@@ -130,5 +130,4 @@
 
 HostnameLookups Off
-#ErrorLog "| sudo -u afsagent /usr/local/bin/process_logs"
 ErrorLog "/home/logview/error_log"
 LogLevel warn
@@ -277,5 +276,4 @@
 
 RLimitCPU 60 60
-#RLimitMEM 536870912 536870912
 RLimitMEM 268435456 268435456 
 RLimitNPROC 1024 1024
@@ -286,8 +284,96 @@
 NameVirtualHost *:80
 NameVirtualHost *:443
+NameVirtualHost 18.181.0.50:80
+NameVirtualHost 18.181.0.50:443
 
 ServerName localhost
 DocumentRoot /afs/athena.mit.edu/contrib/scripts/www
+
+ExtendedStatus On
+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>
+
+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
+
+<VirtualHost _default_:80>
+	ServerName vhosts.mit.edu
+	DocumentRoot /afs/athena.mit.edu/contrib/scripts/vhosts/server.php
+</VirtualHost>
+
+<VirtualHost 18.181.0.50:80>
+	ServerName scripts-cert.mit.edu
+	ServerAlias scripts-cert
+	DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
+	SuExecUserGroup scripts users
+	UserDir web_scripts
+	RewriteEngine Off
+</VirtualHost>
+
+<VirtualHost *:80>
+	ServerName scripts.mit.edu
+	ServerAlias scripts scripts-test.mit.edu scripts-test
+	DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
+	SuExecUserGroup scripts users
+	UserDir web_scripts
+	RewriteEngine Off
+</VirtualHost>
+
+<IfModule mod_ssl.c>
+	SSLCertificateFile /etc/pki/tls/certs/cert-new.pem
+	SSLCertificateKeyFile /etc/pki/tls/private/localhost.key
+	SSLCACertificateFile /etc/pki/tls/certs/ca.pem
+	SSLVerifyClient none
+	SSLOptions +StdEnvVars
+	SSLUserName SSL_CLIENT_S_DN_Email
+	<VirtualHost 18.181.0.50:443>
+		ServerName scripts-cert.mit.edu
+		ServerAlias scripts-cert
+		DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
+		SuExecUserGroup scripts users
+		UserDir web_scripts
+		RewriteEngine Off
+		SSLEngine on
+		SSLCertificateFile /etc/pki/tls/certs/scripts-cert-new.pem
+		SSLVerifyClient require
+		SSLVerifyDepth 1
+		SSLOptions +StdEnvVars
+	</VirtualHost>
+	<VirtualHost *:443>
+		ServerName vhosts.mit.edu
+		ServerAlias vhosts
+		DocumentRoot /afs/athena.mit.edu/contrib/scripts/vhosts/server.php
+		RewriteEngine Off
+		SSLEngine on
+	</VirtualHost>
+	<VirtualHost *:443>
+		ServerName scripts.mit.edu
+		ServerAlias scripts scripts-test.mit.edu scripts-test
+		DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
+		SuExecUserGroup scripts users
+		UserDir web_scripts
+		RewriteEngine Off
+		SSLEngine on
+	</VirtualHost>
+</IfModule>
+
+Include vhosts.d/*.conf
+
+LoadModule fcgid_module modules/mod_fcgid.so
+AddHandler fcgid-script fcgi
+<Files *.fcgi>
+        Options +ExecCGI
+</Files>
+SocketPath run/mod_fcgid
+
 Include conf.d/auth_sslcert.conf
 Include conf.d/execsys.conf
-Include /afs/athena.mit.edu/contrib/scripts/vhosts/better-mousetrap.conf
Index: /server/fedora/config/etc/rc.d/rc.local
===================================================================
--- /server/fedora/config/etc/rc.d/rc.local	(revision 150)
+++ /server/fedora/config/etc/rc.d/rc.local	(revision 151)
@@ -1,5 +1,5 @@
-#!/bin/sh
+#!/bin/bash
 
 touch /var/lock/subsys/local
 
-/bin/mkdir -m 1777 /tmp/sessions
+/bin/mkdir -pm 1773 /tmp/sessions