Index: trunk/server/fedora/config/etc/httpd/vhosts.d/debathena.conf
===================================================================
--- trunk/server/fedora/config/etc/httpd/vhosts.d/debathena.conf (revision 2624)
+++ trunk/server/fedora/config/etc/httpd/vhosts.d/debathena.conf (revision 2731)
@@ -1,20 +1,7 @@
-# do not trailing-slash DocumentRoot
-
-
- ServerName debathena.mit.edu
- ServerAlias debathena
- DocumentRoot /afs/sipb.mit.edu/project/debathena/web_scripts
- Alias /~debathena /afs/sipb.mit.edu/project/debathena/web_scripts
- SuExecUserGroup debathena debathena
- Include conf.d/vhosts-common.conf
-
-
ServerName debathena.mit.edu
ServerAlias debathena
- DocumentRoot /afs/sipb.mit.edu/project/debathena/web_scripts
- Alias /~debathena /afs/sipb.mit.edu/project/debathena/web_scripts
- SuExecUserGroup debathena debathena
+ Include conf.d/vhost_ldap.conf
Include conf.d/vhosts-common-ssl.conf
SSLCertificateFile /etc/pki/tls/certs/debathena.pem
@@ -24,7 +11,5 @@
ServerName debathena.mit.edu
ServerAlias debathena
- DocumentRoot /afs/sipb.mit.edu/project/debathena/web_scripts
- Alias /~debathena /afs/sipb.mit.edu/project/debathena/web_scripts
- SuExecUserGroup debathena debathena
+ Include conf.d/vhost_ldap.conf
Include conf.d/vhosts-common-ssl.conf
Include conf.d/vhosts-common-ssl-cert.conf