Index: server/fedora/config/etc/httpd/conf/httpd.conf
===================================================================
--- server/fedora/config/etc/httpd/conf/httpd.conf	(revision 811)
+++ server/fedora/config/etc/httpd/conf/httpd.conf	(revision 820)
@@ -376,2 +376,3 @@
 Include conf.d/execsys.conf
 Include conf.d/scripts-special.conf
+Include vhosts.d/*.conf
Index: server/fedora/config/etc/httpd/vhosts.d/mitsoc.conf
===================================================================
--- server/fedora/config/etc/httpd/vhosts.d/mitsoc.conf	(revision 820)
+++ server/fedora/config/etc/httpd/vhosts.d/mitsoc.conf	(revision 820)
@@ -0,0 +1,22 @@
+# do not trailing-slash DocumentRoot
+
+<VirtualHost *:80>
+	ServerName mitsoc.mit.edu
+	ServerAlias mitsoc
+	DocumentRoot /afs/athena.mit.edu/path/web_scripts
+	Alias /~mitsoc /afs/athena.mit.edu/path/web_scripts
+	SuExecUserGroup mitsoc mitsoc
+	Include conf.d/vhosts-common.conf
+</VirtualHost>
+
+<IfModule ssl_module>
+	<VirtualHost *:443 *:444>
+		ServerName mitsoc.mit.edu
+		ServerAlias mitsoc
+		DocumentRoot /afs/athena.mit.edu/path/web_scripts
+		Alias /~mitsoc /afs/athena.mit.edu/path/web_scripts
+		SuExecUserGroup mitsoc mitsoc
+		Include conf.d/vhosts-common-ssl.conf
+        SSLCertificateFile /etc/pki/tls/certs/mitsoc.pem
+	</VirtualHost>
+</IfModule>
Index: server/fedora/config/etc/httpd/vhosts.d/random-hall.conf
===================================================================
--- server/fedora/config/etc/httpd/vhosts.d/random-hall.conf	(revision 820)
+++ server/fedora/config/etc/httpd/vhosts.d/random-hall.conf	(revision 820)
@@ -0,0 +1,22 @@
+# do not trailing-slash DocumentRoot
+
+<VirtualHost *:80>
+	ServerName random-hall.mit.edu
+	ServerAlias random-hall
+	DocumentRoot /afs/athena.mit.edu/path/web_scripts
+	Alias /~random-hall /afs/athena.mit.edu/path/web_scripts
+	SuExecUserGroup random-hall random-hall
+	Include conf.d/vhosts-common.conf
+</VirtualHost>
+
+<IfModule ssl_module>
+	<VirtualHost *:443 *:444>
+		ServerName random-hall.mit.edu
+		ServerAlias random-hall
+		DocumentRoot /afs/athena.mit.edu/path/web_scripts
+		Alias /~random-hall /afs/athena.mit.edu/path/web_scripts
+		SuExecUserGroup random-hall random-hall
+		Include conf.d/vhosts-common-ssl.conf
+        SSLCertificateFile /etc/pki/tls/certs/random-hall.pem
+	</VirtualHost>
+</IfModule>
Index: server/fedora/config/etc/httpd/vhosts.d/template
===================================================================
--- server/fedora/config/etc/httpd/vhosts.d/template	(revision 820)
+++ server/fedora/config/etc/httpd/vhosts.d/template	(revision 820)
@@ -0,0 +1,22 @@
+# do not trailing-slash DocumentRoot
+
+<VirtualHost *:80>
+	ServerName hname.mit.edu
+	ServerAlias hname
+	DocumentRoot /afs/athena.mit.edu/path/web_scripts/subdir
+	Alias /~uname /afs/athena.mit.edu/path/web_scripts
+	SuExecUserGroup uname uname
+	Include conf.d/vhosts-common.conf
+</VirtualHost>
+
+<IfModule ssl_module>
+	<VirtualHost *:443 *:444>
+		ServerName hname.mit.edu
+		ServerAlias hname
+		DocumentRoot /afs/athena.mit.edu/path/web_scripts/subdir
+		Alias /~uname /afs/athena.mit.edu/path/web_scripts
+		SuExecUserGroup uname uname
+		Include conf.d/vhosts-common-ssl.conf
+        SSLCertificateFile /etc/pki/tls/certs/hname.pem
+	</VirtualHost>
+</IfModule>