Index: osts/apache2.conf
===================================================================
--- /vhosts/apache2.conf	(revision 397)
+++ 	(revision )
@@ -1,84 +1,0 @@
-RewriteEngine off
-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>
-
-#NameVirtualHost *:80
-#NameVirtualHost *:443
-#NameVirtualHost 18.181.0.46:80
-#NameVirtualHost 18.181.0.46:443
-NameVirtualHost 18.181.0.50:80
-NameVirtualHost 18.181.0.50:443
-
-Alias /heartbeat /afs/athena.mit.edu/contrib/scripts/web_scripts/heartbeat
-Alias /src /afs/athena.mit.edu/contrib/scripts/src
-
-<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 /afs/athena.mit.edu/contrib/scripts/vhosts/conf.d/*.conf
Index: osts/apache2.conf-backup
===================================================================
--- /vhosts/apache2.conf-backup	(revision 397)
+++ 	(revision )
@@ -1,61 +1,0 @@
-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
-</VirtualHost>
-
-<VirtualHost *:80>
-    ServerName scripts.mit.edu
-    ServerAlias scripts
-    DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
-    SuExecUserGroup scripts users
-</VirtualHost>
-
-<IfModule mod_ssl.c>
-    <VirtualHost 18.181.0.50:443>
-        ServerName scripts-cert.mit.edu
-        ServerAlias scripts-cert
-        DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
-        SSLEngine on
-        SSLCertificateFile /etc/pki/tls/certs/scripts-cert.pem
-        SSLCertificateKeyFile /etc/pki/tls/private/scripts-cert.pem
-        SSLCACertificateFile /etc/pki/tls/certs/ca.pem
-        SSLVerifyClient require
-        SSLVerifyDepth 1
-        SSLOptions +StdEnvVars
-        SuExecUserGroup scripts users
-    </VirtualHost>
-    <VirtualHost *:443>
-        ServerName vhosts.mit.edu
-        ServerAlias vhosts
-        DocumentRoot /afs/athena.mit.edu/contrib/scripts/vhosts/server.php
-        SSLEngine on
-        SSLCertificateFile /etc/pki/tls/certs/cert.pem
-        SSLCertificateKeyFile /etc/pki/tls/private/key.pem
-        SSLCACertificateFile /etc/pki/tls/certs/ca.pem
-        SSLVerifyClient none
-        SSLOptions +StdEnvVars
-    </VirtualHost>
-    <VirtualHost *:443>
-        ServerName scripts.mit.edu
-        ServerAlias scripts
-        DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
-        SSLEngine on
-        SSLCertificateFile /etc/pki/tls/certs/cert.pem
-        SSLCertificateKeyFile /etc/pki/tls/private/key.pem
-        SSLCACertificateFile /etc/pki/tls/certs/ca.pem
-        SSLVerifyClient none
-        SSLOptions +StdEnvVars
-        SuExecUserGroup scripts users
-    </VirtualHost>
-</IfModule>
-
-Include /afs/athena.mit.edu/contrib/scripts/vhosts/conf.d/*.conf
Index: osts/apache2.conf-new
===================================================================
--- /vhosts/apache2.conf-new	(revision 397)
+++ 	(revision )
@@ -1,61 +1,0 @@
-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
-</VirtualHost>
-
-<VirtualHost *:80>
-    ServerName scripts.mit.edu
-    ServerAlias scripts
-    DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
-    SuExecUserGroup scripts users
-</VirtualHost>
-
-<IfModule mod_ssl.c>
-    <VirtualHost 18.181.0.50:443>
-        ServerName scripts-cert.mit.edu
-        ServerAlias scripts-cert
-        DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
-        SSLEngine on
-        SSLCertificateFile /etc/pki/tls/certs/scripts-cert-new.pem
-        SSLCertificateKeyFile /etc/pki/tls/private/localhost.key
-        SSLCACertificateFile /etc/pki/tls/certs/ca.pem
-        SSLVerifyClient require
-        SSLVerifyDepth 1
-        SSLOptions +StdEnvVars
-        SuExecUserGroup scripts users
-    </VirtualHost>
-    <VirtualHost *:443>
-        ServerName vhosts.mit.edu
-        ServerAlias vhosts
-        DocumentRoot /afs/athena.mit.edu/contrib/scripts/vhosts/server.php
-        SSLEngine on
-        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
-    </VirtualHost>
-    <VirtualHost *:443>
-        ServerName scripts.mit.edu
-        ServerAlias scripts
-        DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
-        SSLEngine on
-        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
-        SuExecUserGroup scripts users
-    </VirtualHost>
-</IfModule>
-
-Include /afs/athena.mit.edu/contrib/scripts/vhosts/conf.d/*.conf
Index: osts/apache2.conf-newssl
===================================================================
--- /vhosts/apache2.conf-newssl	(revision 397)
+++ 	(revision )
@@ -1,67 +1,0 @@
-RewriteEngine off
-Redirect /sql https://scripts.mit.edu/~sql
-
-Alias /heartbeat /afs/athena.mit.edu/contrib/scripts/web_scripts/heartbeat
-Alias /src /afs/athena.mit.edu/contrib/scripts/src
-
-<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
-    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
-    <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
-	DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
-		SuExecUserGroup scripts users
-		UserDir web_scripts
-		RewriteEngine off
-	SSLEngine on
-    </VirtualHost>
-</IfModule>
-
-Include /afs/athena.mit.edu/contrib/scripts/vhosts/conf.d/*.conf
Index: osts/apache2.conf-newuserdir
===================================================================
--- /vhosts/apache2.conf-newuserdir	(revision 397)
+++ 	(revision )
@@ -1,74 +1,0 @@
-RewriteEngine off
-Redirect /sql https://scripts.mit.edu/~sql
-
-Alias /heartbeat /afs/athena.mit.edu/contrib/scripts/web_scripts/heartbeat
-Alias /src /afs/athena.mit.edu/contrib/scripts/src
-
-<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
-    DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
-    SuExecUserGroup scripts users
-	UserDir web_scripts
-	RewriteEngine off
-</VirtualHost>
-
-<IfModule mod_ssl.c>
-    <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
-        SSLCertificateKeyFile /etc/pki/tls/private/localhost.key
-        SSLCACertificateFile /etc/pki/tls/certs/ca.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
-        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
-    </VirtualHost>
-    <VirtualHost *:443>
-        ServerName scripts.mit.edu
-        ServerAlias scripts
-        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/cert-new.pem
-        SSLCertificateKeyFile /etc/pki/tls/private/localhost.key
-        SSLCACertificateFile /etc/pki/tls/certs/ca.pem
-        SSLVerifyClient none
-        SSLOptions +StdEnvVars
-    </VirtualHost>
-</IfModule>
-
-Include /afs/athena.mit.edu/contrib/scripts/vhosts/conf.d/*.conf
Index: osts/apache2.conf-nossl
===================================================================
--- /vhosts/apache2.conf-nossl	(revision 397)
+++ 	(revision )
@@ -1,84 +1,0 @@
-RewriteEngine off
-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>
-
-#NameVirtualHost *:80
-#NameVirtualHost *:443
-#NameVirtualHost 18.181.0.46:80
-#NameVirtualHost 18.181.0.46:443
-NameVirtualHost 18.181.0.50:80
-NameVirtualHost 18.181.0.50:443
-
-Alias /heartbeat /afs/athena.mit.edu/contrib/scripts/web_scripts/heartbeat
-Alias /src /afs/athena.mit.edu/contrib/scripts/src
-
-<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 /afs/athena.mit.edu/contrib/scripts/vhosts/conf.d/*.conf
Index: osts/apache2.conf-oldssl
===================================================================
--- /vhosts/apache2.conf-oldssl	(revision 397)
+++ 	(revision )
@@ -1,74 +1,0 @@
-RewriteEngine off
-Redirect /sql https://scripts.mit.edu/~sql
-
-Alias /heartbeat /afs/athena.mit.edu/contrib/scripts/web_scripts/heartbeat
-Alias /src /afs/athena.mit.edu/contrib/scripts/src
-
-<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
-    DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
-    SuExecUserGroup scripts users
-	UserDir web_scripts
-	RewriteEngine off
-</VirtualHost>
-
-<IfModule mod_ssl.c>
-    <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
-	SSLCertificateKeyFile /etc/pki/tls/private/localhost.key
-	SSLCACertificateFile /etc/pki/tls/certs/ca.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
-	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
-    </VirtualHost>
-    <VirtualHost *:443>
-	ServerName scripts.mit.edu
-	ServerAlias scripts
-	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/cert-new.pem
-	SSLCertificateKeyFile /etc/pki/tls/private/localhost.key
-	SSLCACertificateFile /etc/pki/tls/certs/ca.pem
-	SSLVerifyClient none
-	SSLOptions +StdEnvVars
-    </VirtualHost>
-</IfModule>
-
-Include /afs/athena.mit.edu/contrib/scripts/vhosts/conf.d/*.conf
Index: osts/apache2.conf-olduserdir
===================================================================
--- /vhosts/apache2.conf-olduserdir	(revision 397)
+++ 	(revision )
@@ -1,71 +1,0 @@
-RewriteEngine off
-Redirect /sql https://scripts.mit.edu/~sql
-
-Alias /heartbeat /afs/athena.mit.edu/contrib/scripts/web_scripts/heartbeat
-Alias /src /afs/athena.mit.edu/contrib/scripts/src
-
-<VirtualHost _default_:80>
-    ServerName vhosts.mit.edu
-    DocumentRoot /afs/athena.mit.edu/contrib/scripts/vhosts/server.php
-#	RewriteEngine On
-#	RewriteRule heartbeat(.*) /afs/athena.mit.edu/contrib/scripts/web_scripts/heartbeat.php [L]
-</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
-</VirtualHost>
-
-<VirtualHost *:80>
-    ServerName scripts.mit.edu
-    ServerAlias scripts
-    DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
-    SuExecUserGroup scripts users
-	RewriteEngine off
-</VirtualHost>
-
-<IfModule mod_ssl.c>
-    <VirtualHost 18.181.0.50:443>
-        ServerName scripts-cert.mit.edu
-        ServerAlias scripts-cert
-        DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
-        SSLEngine on
-        SSLCertificateFile /etc/pki/tls/certs/scripts-cert-new.pem
-        SSLCertificateKeyFile /etc/pki/tls/private/localhost.key
-        SSLCACertificateFile /etc/pki/tls/certs/ca.pem
-        SSLVerifyClient require
-        SSLVerifyDepth 1
-        SSLOptions +StdEnvVars
-        SuExecUserGroup scripts users
-		RewriteEngine off
-    </VirtualHost>
-    <VirtualHost *:443>
-        ServerName vhosts.mit.edu
-        ServerAlias vhosts
-        DocumentRoot /afs/athena.mit.edu/contrib/scripts/vhosts/server.php
-        SSLEngine on
-        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
-		RewriteEngine off
-    </VirtualHost>
-    <VirtualHost *:443>
-        ServerName scripts.mit.edu
-        ServerAlias scripts
-        DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
-        SSLEngine on
-        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
-        SuExecUserGroup scripts users
-		RewriteEngine off
-    </VirtualHost>
-</IfModule>
-
-Include /afs/athena.mit.edu/contrib/scripts/vhosts/conf.d/*.conf
Index: osts/better-mousetrap.conf
===================================================================
--- /vhosts/better-mousetrap.conf	(revision 397)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link apache2.conf
Index: osts/old-kitchen-sink.conf
===================================================================
--- /vhosts/old-kitchen-sink.conf	(revision 397)
+++ 	(revision )
@@ -1,65 +1,0 @@
-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
-    User scripts
-    Group webusers
-</VirtualHost>
-
-<VirtualHost *:80>
-    ServerName scripts.mit.edu
-    ServerAlias scripts
-    DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
-    User scripts
-    Group webusers
-</VirtualHost>
-
-<IfModule mod_ssl.c>
-    <VirtualHost 18.181.0.50:443>
-        ServerName scripts-cert.mit.edu
-        ServerAlias scripts-cert
-        DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
-        SSLEngine on
-        SSLCertificateFile /etc/ssl/certs/scripts-cert.pem
-        SSLCertificateKeyFile /etc/ssl/private/scripts-cert.pem
-        SSLCACertificateFile /etc/ssl/certs/ca.pem
-        SSLVerifyClient require
-        SSLVerifyDepth 1
-        SSLOptions +StdEnvVars +CompatEnvVars
-        User scripts
-        Group webusers
-    </VirtualHost>
-    <VirtualHost *:443>
-        ServerName vhosts.mit.edu
-        ServerAlias vhosts
-        DocumentRoot /afs/athena.mit.edu/contrib/scripts/vhosts/server.php
-        SSLEngine on
-        SSLCertificateFile /etc/ssl/certs/cert.pem
-        SSLCertificateKeyFile /etc/ssl/private/key.pem
-        SSLCACertificateFile /etc/ssl/certs/ca.pem
-        SSLVerifyClient none
-        SSLOptions +StdEnvVars +CompatEnvVars
-    </VirtualHost>
-    <VirtualHost *:443>
-        ServerName scripts.mit.edu
-        ServerAlias scripts
-        DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
-        SSLEngine on
-        SSLCertificateFile /etc/ssl/certs/cert.pem
-        SSLCertificateKeyFile /etc/ssl/private/key.pem
-        SSLCACertificateFile /etc/ssl/certs/ca.pem
-        SSLVerifyClient none
-        SSLOptions +StdEnvVars +CompatEnvVars
-        User scripts
-        Group webusers
-    </VirtualHost>
-</IfModule>
-
-Include /afs/athena.mit.edu/contrib/scripts/vhosts/conf.d/*.conf
Index: osts/server1.php
===================================================================
--- /vhosts/server1.php	(revision 397)
+++ 	(revision )
@@ -1,49 +1,0 @@
-<?php
-if (isset($_SERVER['SERVER_NAME'])) $name = $_SERVER['SERVER_NAME']; else $name = '';
-if (isset($_SERVER['REQUEST_URI'])) $req = $_SERVER['REQUEST_URI']; else $req = '/';
-if (isset($_SERVER['PATH_INFO'])) $pi = explode('/',$_SERVER['PATH_INFO']);
-if (isset($_SERVER['SERVER_PORT'])) $port = $_SERVER['SERVER_PORT']; else $port = '80';
-
-// catch a docroot from the DocumentRoot directive in an apacheconf
-$documentRoot = str_replace(__FILE__,'',$_SERVER['DOCUMENT_ROOT']);
-if (!empty($documentRoot) && substr($documentRoot,0,1) == '/')
-	$documentRoot = substr($documentRoot, 1);
-if (empty($documentRoot))
-	$documentRoot = array_shift(explode('.',$_SERVER['SERVER_NAME']));
-
-switch($port) {
-	case 443:
-		$myHTTP = 'https';
-		$mySSL = true;
-		break;
-	default:
-		$myHTTP = 'http';
-		$mySSL = false;
-		break;
-}
-
-$myTitle = $name;
-$baseHTTP = 'http://scripts.mit.edu/~'.$documentRoot;
-$baseHTTPS = 'https://scripts.mit.edu/~'.$documentRoot;
-
-$settingsFile1 = '/afs/athena.mit.edu/contrib/scripts/vhosts/settings/'.$name;
-$settingsFile2 = '/afs/athena.mit.edu/contrib/scripts/vhosts/settings/'.$name.'.mit.edu';
-$settings = array();
-file_exists($settingsFile1) && $settings = file($settingsFile1);
-file_exists($settingsFile2) && $settings = file($settingsFile2);
-if (count($settings)) {
-	if (count($settings) >= 0 && '' != trim($settings[0])) $myTitle = trim($settings[0]);
-	if (count($settings) >= 1 && '' != trim($settings[1])) $baseHTTP = trim($settings[1]);
-	if (count($settings) >= 2 && '' != trim($settings[2])) $baseHTTPS = trim($settings[2]);
-}
-
-$baseURL = $mySSL?$baseHTTPS:$baseHTTP;
-?>
-<html>
-<head><title><?=$myTitle?></title></head>
-
-<frameset rows="*">
-	<frame src="<?=$baseURL?><?=$req?>" />
-</frameset>
-
-</html>
Index: osts/settings/18.181.0.46
===================================================================
--- /vhosts/settings/18.181.0.46	(revision 397)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link scripts.mit.edu
Index: osts/settings/6001.mit.edu
===================================================================
--- /vhosts/settings/6001.mit.edu	(revision 397)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link cadr.mit.edu
Index: osts/settings/amirhirsch.com
===================================================================
--- /vhosts/settings/amirhirsch.com	(revision 397)
+++ 	(revision )
@@ -1,3 +1,0 @@
-amirhirsch.com
-http://scripts.mit.edu/~amirh/amirhirsch.com
-https://scripts.mit.edu/~amirh/amirhirsch.com
Index: osts/settings/ashdown.mit.edu
===================================================================
--- /vhosts/settings/ashdown.mit.edu	(revision 397)
+++ 	(revision )
@@ -1,3 +1,0 @@
-ashdown.mit.edu
-http://scripts.mit.edu/~ashdown
-https://scripts-cert.mit.edu/~ashdown
Index: osts/settings/ashdownhouse.org
===================================================================
--- /vhosts/settings/ashdownhouse.org	(revision 397)
+++ 	(revision )
@@ -1,3 +1,0 @@
-ashdownhouse.org
-http://scripts.mit.edu/~ashdown
-https://scripts-cert.mit.edu/~ashdown
Index: /vhosts/settings/bunnyfish.mit.edu
===================================================================
--- /vhosts/settings/bunnyfish.mit.edu	(revision 397)
+++ /vhosts/settings/bunnyfish.mit.edu	(revision 398)
@@ -1,3 +1,3 @@
 Connie's MIT Stuff
-http://scripts.mit.edu/~yehc/www/
-https://scripts-cert.mit.edu/~yehc/www/
+http://scripts.mit.edu/~yehc/www
+https://scripts-cert.mit.edu/~yehc/www
Index: osts/settings/fpgawiki.com
===================================================================
--- /vhosts/settings/fpgawiki.com	(revision 397)
+++ 	(revision )
@@ -1,3 +1,0 @@
-fpgawiki.com
-http://scripts.mit.edu/~amirh/fpgawiki.com
-https://scripts.mit.edu/~amirh/fpgawiki.com
Index: osts/settings/kitchen-sink.mit.edu
===================================================================
--- /vhosts/settings/kitchen-sink.mit.edu	(revision 397)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link scripts.mit.edu
Index: osts/settings/maslab.mit.edu
===================================================================
--- /vhosts/settings/maslab.mit.edu	(revision 397)
+++ 	(revision )
@@ -1,3 +1,0 @@
-maslab.mit.edu
-http://scripts.mit.edu/~6.186
-https://scripts.mit.edu/~6.186
Index: osts/settings/presbrey.mit.edu
===================================================================
--- /vhosts/settings/presbrey.mit.edu	(revision 397)
+++ 	(revision )
@@ -1,3 +1,0 @@
-presbrey.mit.edu
-http://mit.edu/presbrey
-http://mit.edu/presbrey
Index: /vhosts/settings/ps3network.org
===================================================================
--- /vhosts/settings/ps3network.org	(revision 398)
+++ /vhosts/settings/ps3network.org	(revision 398)
@@ -0,0 +1,3 @@
+www.ps3network.org
+http://scripts.mit.edu/~amirh/ps3network.org
+https://scripts.mit.edu/~amirh/ps3network.org
Index: osts/settings/rov.mit.edu
===================================================================
--- /vhosts/settings/rov.mit.edu	(revision 397)
+++ 	(revision )
@@ -1,3 +1,0 @@
-MIT's Remotely Operated Vehicle Team
-http://scripts.mit.edu/~13.704
-https://scripts.mit.edu/~13.704
Index: osts/settings/scripts-test.mit.edu
===================================================================
--- /vhosts/settings/scripts-test.mit.edu	(revision 397)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link scripts.mit.edu
Index: osts/settings/scripts.mit.edu
===================================================================
--- /vhosts/settings/scripts.mit.edu	(revision 397)
+++ 	(revision )
@@ -1,3 +1,0 @@
-scripts.mit.edu
-http://scripts.mit.edu
-https://scripts.mit.edu
Index: osts/settings/tdc.mit.edu
===================================================================
--- /vhosts/settings/tdc.mit.edu	(revision 397)
+++ 	(revision )
@@ -1,3 +1,0 @@
-Theta Delta Chi - Massachusetts Institute of Technology
-http://scripts.mit.edu/~tdc
-https://scripts.mit.edu/~tdc
Index: /vhosts/settings/torg.mit.edu
===================================================================
--- /vhosts/settings/torg.mit.edu	(revision 397)
+++ /vhosts/settings/torg.mit.edu	(revision 398)
@@ -1,3 +1,3 @@
 torg.mit.edu
-http://scripts.mit.edu/~rspeer/redirect/
-https://scripts.mit.edu/~rspeer/redirect/
+http://scripts.mit.edu/~rspeer/redirect
+https://scripts.mit.edu/~rspeer/redirect
Index: /vhosts/vhosts-vhost-names.gen.sh
===================================================================
--- /vhosts/vhosts-vhost-names.gen.sh	(revision 397)
+++ /vhosts/vhosts-vhost-names.gen.sh	(revision 398)
@@ -1,4 +1,16 @@
 #!/bin/sh
-cd /mit/scripts/vhosts/settings/ || exit 1
+cd settings || exit 1
+vhosts=
+check () {
+    host -t A "$1" | grep -q " has address 18\.181\.0\.46$" && \
+	vhosts=$vhosts\ $1
+}
+for i in *; do
+    check "$i" || echo "warning: $i does not point to scripts!"
+    check "www.$i"
+    if echo "$i" | grep -q '\.mit\.edu$'; then
+	check "$(echo "$i" | sed 's/\.mit\.edu$//')"
+    fi
+done
 echo "ServerName vhosts.mit.edu"
-echo -n "ServerAlias "; echo * | perl -pe 's/(\S+)\.mit\.edu/\1.mit.edu \1/g'
+echo "ServerAlias$vhosts"