Index: trunk/server/fedora/config/etc/httpd/vhosts.d/6005.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/6005.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/6005.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName 6005.mit.edu - ServerAlias 6005 - DocumentRoot /afs/athena.mit.edu/course/6/6.005/web_scripts - Alias /~6.005 /afs/athena.mit.edu/course/6/6.005/web_scripts - SuExecUserGroup 6.005 6.005 - Include conf.d/vhosts-common.conf - - ServerName 6005.mit.edu ServerAlias 6005 - DocumentRoot /afs/athena.mit.edu/course/6/6.005/web_scripts - Alias /~6.005 /afs/athena.mit.edu/course/6/6.005/web_scripts - SuExecUserGroup 6.005 6.005 + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/6005.pem @@ -24,7 +11,5 @@ ServerName 6005.mit.edu ServerAlias 6005 - DocumentRoot /afs/athena.mit.edu/course/6/6.005/web_scripts - Alias /~6.005 /afs/athena.mit.edu/course/6/6.005/web_scripts - SuExecUserGroup 6.005 6.005 + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/6005scripts.csail.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/6005scripts.csail.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/6005scripts.csail.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName 6005scripts.csail.mit.edu - ServerAlias 6005scripts.csail - DocumentRoot /afs/athena.mit.edu/course/6/6.005/web_scripts - Alias /~6.005 /afs/athena.mit.edu/course/6/6.005/web_scripts - SuExecUserGroup 6.005 6.005 - Include conf.d/vhosts-common.conf - - ServerName 6005scripts.csail.mit.edu ServerAlias 6005scripts.csail - DocumentRoot /afs/athena.mit.edu/course/6/6.005/web_scripts - Alias /~6.005 /afs/athena.mit.edu/course/6/6.005/web_scripts - SuExecUserGroup 6.005 6.005 + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/6005scripts.csail.pem @@ -24,7 +11,5 @@ ServerName 6005scripts.csail.mit.edu ServerAlias 6005scripts.csail - DocumentRoot /afs/athena.mit.edu/course/6/6.005/web_scripts - Alias /~6.005 /afs/athena.mit.edu/course/6/6.005/web_scripts - SuExecUserGroup 6.005 6.005 + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/achernya.com.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/achernya.com.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/achernya.com.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName achernya.com - - DocumentRoot /afs/athena.mit.edu/user/a/c/achernya/web_scripts/achernya - Alias /~achernya /afs/athena.mit.edu/user/a/c/achernya/web_scripts - SuExecUserGroup achernya achernya - Include conf.d/vhosts-common.conf - - ServerName achernya.com - DocumentRoot /afs/athena.mit.edu/user/a/c/achernya/web_scripts/achernya - Alias /~achernya /afs/athena.mit.edu/user/a/c/achernya/web_scripts - SuExecUserGroup achernya achernya + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/achernya.com.pem @@ -24,7 +11,5 @@ ServerName achernya.com - DocumentRoot /afs/athena.mit.edu/user/a/c/achernya/web_scripts/achernya - Alias /~achernya /afs/athena.mit.edu/user/a/c/achernya/web_scripts - SuExecUserGroup achernya achernya + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/adviseme.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/adviseme.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/adviseme.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName adviseme.mit.edu - ServerAlias adviseme - DocumentRoot /afs/athena.mit.edu/activity/p/peeradvising/web_scripts/home - Alias /~peeradvising /afs/athena.mit.edu/activity/p/peeradvising/web_scripts - SuExecUserGroup peeradvising peeradvising - Include conf.d/vhosts-common.conf - - ServerName adviseme.mit.edu ServerAlias adviseme - DocumentRoot /afs/athena.mit.edu/activity/p/peeradvising/web_scripts/home - Alias /~peeradvising /afs/athena.mit.edu/activity/p/peeradvising/web_scripts - SuExecUserGroup peeradvising peeradvising + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/adviseme.pem @@ -24,7 +11,5 @@ ServerName adviseme.mit.edu ServerAlias adviseme - DocumentRoot /afs/athena.mit.edu/activity/p/peeradvising/web_scripts/home - Alias /~peeradvising /afs/athena.mit.edu/activity/p/peeradvising/web_scripts - SuExecUserGroup peeradvising peeradvising + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/aepi.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/aepi.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/aepi.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName aepi.mit.edu - ServerAlias aepi - DocumentRoot /afs/athena.mit.edu/activity/a/aepi/web_scripts - Alias /~aepi /afs/athena.mit.edu/activity/a/aepi/web_scripts - SuExecUserGroup aepi aepi - Include conf.d/vhosts-common.conf - - ServerName aepi.mit.edu ServerAlias aepi - DocumentRoot /afs/athena.mit.edu/activity/a/aepi/web_scripts - Alias /~aepi /afs/athena.mit.edu/activity/a/aepi/web_scripts - SuExecUserGroup aepi aepi + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/aepi.pem @@ -24,7 +11,5 @@ ServerName aepi.mit.edu ServerAlias aepi - DocumentRoot /afs/athena.mit.edu/activity/a/aepi/web_scripts - Alias /~aepi /afs/athena.mit.edu/activity/a/aepi/web_scripts - SuExecUserGroup aepi aepi + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/ai6034.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/ai6034.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/ai6034.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName ai6034.mit.edu - ServerAlias ai6034 - DocumentRoot /afs/athena.mit.edu/course/6/6.034/web_scripts - Alias /~6.034 /afs/athena.mit.edu/course/6/6.034/web_scripts - SuExecUserGroup 6.034 6.034 - Include conf.d/vhosts-common.conf - - ServerName ai6034.mit.edu ServerAlias ai6034 - DocumentRoot /afs/athena.mit.edu/course/6/6.034/web_scripts - Alias /~6.034 /afs/athena.mit.edu/course/6/6.034/web_scripts - SuExecUserGroup 6.034 6.034 + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/ai6034.pem @@ -24,7 +11,5 @@ ServerName ai6034.mit.edu ServerAlias ai6034 - DocumentRoot /afs/athena.mit.edu/course/6/6.034/web_scripts - Alias /~6.034 /afs/athena.mit.edu/course/6/6.034/web_scripts - SuExecUserGroup 6.034 6.034 + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/asa.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/asa.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/asa.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName asa.mit.edu - ServerAlias asa - DocumentRoot /afs/athena.mit.edu/activity/a/asa-db/web_scripts/db - Alias /~asa-db /afs/athena.mit.edu/activity/a/asa-db/web_scripts - SuExecUserGroup asa-db asa-db - Include conf.d/vhosts-common.conf - - ServerName asa.mit.edu ServerAlias asa - DocumentRoot /afs/athena.mit.edu/activity/a/asa-db/web_scripts/db - Alias /~asa-db /afs/athena.mit.edu/activity/a/asa-db/web_scripts - SuExecUserGroup asa-db asa-db + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/asa.pem @@ -24,7 +11,5 @@ ServerName asa.mit.edu ServerAlias asa - DocumentRoot /afs/athena.mit.edu/activity/a/asa-db/web_scripts/db - Alias /~asa-db /afs/athena.mit.edu/activity/a/asa-db/web_scripts - SuExecUserGroup asa-db asa-db + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/ashdown.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/ashdown.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/ashdown.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName ashdown.mit.edu - ServerAlias ashdown - DocumentRoot /afs/athena.mit.edu/activity/a/ashdown/web_scripts - Alias /~ashdown /afs/athena.mit.edu/activity/a/ashdown/web_scripts - SuExecUserGroup ashdown ashdown - Include conf.d/vhosts-common.conf - - ServerName ashdown.mit.edu ServerAlias ashdown - DocumentRoot /afs/athena.mit.edu/activity/a/ashdown/web_scripts - Alias /~ashdown /afs/athena.mit.edu/activity/a/ashdown/web_scripts - SuExecUserGroup ashdown ashdown + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/ashdown.pem @@ -24,7 +11,5 @@ ServerName ashdown.mit.edu ServerAlias ashdown - DocumentRoot /afs/athena.mit.edu/activity/a/ashdown/web_scripts - Alias /~ashdown /afs/athena.mit.edu/activity/a/ashdown/web_scripts - SuExecUserGroup ashdown ashdown + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/auth.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/auth.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/auth.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName auth.mit.edu - ServerAlias auth - DocumentRoot /afs/athena.mit.edu/user/b/b/bbaren/web_scripts/openid - Alias /~bbaren /afs/athena.mit.edu/user/b/b/bbaren/web_scripts - SuExecUserGroup bbaren bbaren - Include conf.d/vhosts-common.conf - - ServerName auth.mit.edu ServerAlias auth - DocumentRoot /afs/athena.mit.edu/user/b/b/bbaren/web_scripts/openid - Alias /~bbaren /afs/athena.mit.edu/user/b/b/bbaren/web_scripts - SuExecUserGroup bbaren bbaren + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/auth.pem @@ -24,7 +11,5 @@ ServerName auth.mit.edu ServerAlias auth - DocumentRoot /afs/athena.mit.edu/user/b/b/bbaren/web_scripts/openid - Alias /~bbaren /afs/athena.mit.edu/user/b/b/bbaren/web_scripts - SuExecUserGroup bbaren bbaren + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/axo.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/axo.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/axo.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName axo.mit.edu - ServerAlias axo - DocumentRoot /afs/athena.mit.edu/activity/a/axo/web_scripts/site - Alias /~axo /afs/athena.mit.edu/activity/a/axo/web_scripts - SuExecUserGroup axo axo - Include conf.d/vhosts-common.conf - - ServerName axo.mit.edu ServerAlias axo - DocumentRoot /afs/athena.mit.edu/activity/a/axo/web_scripts/site - Alias /~axo /afs/athena.mit.edu/activity/a/axo/web_scripts - SuExecUserGroup axo axo + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/axo.pem @@ -24,7 +11,5 @@ ServerName axo.mit.edu ServerAlias axo - DocumentRoot /afs/athena.mit.edu/activity/a/axo/web_scripts/site - Alias /~axo /afs/athena.mit.edu/activity/a/axo/web_scripts - SuExecUserGroup axo axo + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/barnowl.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/barnowl.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/barnowl.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName barnowl.mit.edu - ServerAlias barnowl - DocumentRoot /afs/.sipb.mit.edu/project/barnowl/web_scripts - Alias /~barnowl /afs/.sipb.mit.edu/project/barnowl/web_scripts - SuExecUserGroup barnowl barnowl - Include conf.d/vhosts-common.conf - - ServerName barnowl.mit.edu ServerAlias barnowl - DocumentRoot /afs/.sipb.mit.edu/project/barnowl/web_scripts - Alias /~barnowl /afs/.sipb.mit.edu/project/barnowl/web_scripts - SuExecUserGroup barnowl barnowl + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/barnowl.pem @@ -24,7 +11,5 @@ ServerName barnowl.mit.edu ServerAlias barnowl - DocumentRoot /afs/.sipb.mit.edu/project/barnowl/web_scripts - Alias /~barnowl /afs/.sipb.mit.edu/project/barnowl/web_scripts - SuExecUserGroup barnowl barnowl + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/bc.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/bc.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/bc.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName bc.mit.edu - ServerAlias bc - DocumentRoot /afs/athena.mit.edu/activity/b/bc-desk/web_scripts - Alias /~bc-desk /afs/athena.mit.edu/activity/b/bc-desk/web_scripts - SuExecUserGroup bc-desk bc-desk - Include conf.d/vhosts-common.conf - - ServerName bc.mit.edu ServerAlias bc - DocumentRoot /afs/athena.mit.edu/activity/b/bc-desk/web_scripts - Alias /~bc-desk /afs/athena.mit.edu/activity/b/bc-desk/web_scripts - SuExecUserGroup bc-desk bc-desk + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/bc.pem @@ -24,7 +11,5 @@ ServerName bc.mit.edu ServerAlias bc - DocumentRoot /afs/athena.mit.edu/activity/b/bc-desk/web_scripts - Alias /~bc-desk /afs/athena.mit.edu/activity/b/bc-desk/web_scripts - SuExecUserGroup bc-desk bc-desk + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/blog.sl2.xyz.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/blog.sl2.xyz.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/blog.sl2.xyz.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName blog.sl2.xyz - - DocumentRoot /afs/athena.mit.edu/user/s/l/slz/web_scripts/blog.sl2.xyz - Alias /~slz /afs/athena.mit.edu/user/s/l/slz/web_scripts - SuExecUserGroup slz slz - Include conf.d/vhosts-common.conf - - ServerName blog.sl2.xyz - DocumentRoot /afs/athena.mit.edu/user/s/l/slz/web_scripts/blog.sl2.xyz - Alias /~slz /afs/athena.mit.edu/user/s/l/slz/web_scripts - SuExecUserGroup slz slz + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/blog.sl2.xyz.pem @@ -24,7 +11,5 @@ ServerName blog.sl2.xyz - DocumentRoot /afs/athena.mit.edu/user/s/l/slz/web_scripts/blog.sl2.xyz - Alias /~slz /afs/athena.mit.edu/user/s/l/slz/web_scripts - SuExecUserGroup slz slz + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/bluechips.emergent-studios.com.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/bluechips.emergent-studios.com.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/bluechips.emergent-studios.com.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName bluechips.emergent-studios.com - - DocumentRoot /afs/sipb.mit.edu/contrib/blue-sun/web_scripts/bluechips.emergent-studios.com - Alias /~blue-sun /afs/sipb.mit.edu/contrib/blue-sun/web_scripts - SuExecUserGroup blue-sun blue-sun - Include conf.d/vhosts-common.conf - - ServerName bluechips.emergent-studios.com - DocumentRoot /afs/sipb.mit.edu/contrib/blue-sun/web_scripts/bluechips.emergent-studios.com - Alias /~blue-sun /afs/sipb.mit.edu/contrib/blue-sun/web_scripts - SuExecUserGroup blue-sun blue-sun + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/bluechips.emergent-studios.com.pem @@ -24,7 +11,5 @@ ServerName bluechips.emergent-studios.com - DocumentRoot /afs/sipb.mit.edu/contrib/blue-sun/web_scripts/bluechips.emergent-studios.com - Alias /~blue-sun /afs/sipb.mit.edu/contrib/blue-sun/web_scripts - SuExecUserGroup blue-sun blue-sun + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/bots.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/bots.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/bots.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName bots.mit.edu - ServerAlias bots - DocumentRoot /afs/athena.mit.edu/course/6/6.270/web_scripts - Alias /~6.270 /afs/athena.mit.edu/course/6/6.270/web_scripts - SuExecUserGroup 6.270 6.270 - Include conf.d/vhosts-common.conf - - ServerName bots.mit.edu ServerAlias bots - DocumentRoot /afs/athena.mit.edu/course/6/6.270/web_scripts - Alias /~6.270 /afs/athena.mit.edu/course/6/6.270/web_scripts - SuExecUserGroup 6.270 6.270 + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/bots.pem @@ -24,7 +11,5 @@ ServerName bots.mit.edu ServerAlias bots - DocumentRoot /afs/athena.mit.edu/course/6/6.270/web_scripts - Alias /~6.270 /afs/athena.mit.edu/course/6/6.270/web_scripts - SuExecUserGroup 6.270 6.270 + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/carepackages.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/carepackages.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/carepackages.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName carepackages.mit.edu - ServerAlias carepackages - DocumentRoot /afs/athena.mit.edu/user/a/f/afarrell/web_scripts/uso - Alias /~afarrell /afs/athena.mit.edu/user/a/f/afarrell/web_scripts - SuExecUserGroup afarrell afarrell - Include conf.d/vhosts-common.conf - - ServerName carepackages.mit.edu ServerAlias carepackages - DocumentRoot /afs/athena.mit.edu/user/a/f/afarrell/web_scripts/uso - Alias /~afarrell /afs/athena.mit.edu/user/a/f/afarrell/web_scripts - SuExecUserGroup afarrell afarrell + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/carepackages.pem @@ -24,7 +11,5 @@ ServerName carepackages.mit.edu ServerAlias carepackages - DocumentRoot /afs/athena.mit.edu/user/a/f/afarrell/web_scripts/uso - Alias /~afarrell /afs/athena.mit.edu/user/a/f/afarrell/web_scripts - SuExecUserGroup afarrell afarrell + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/chatter.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/chatter.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/chatter.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName chatter.mit.edu - ServerAlias chatter - DocumentRoot /afs/athena.mit.edu/user/e/s/eschmidt/web_scripts/chatter - Alias /~eschmidt /afs/athena.mit.edu/user/e/s/eschmidt/web_scripts - SuExecUserGroup eschmidt eschmidt - Include conf.d/vhosts-common.conf - - ServerName chatter.mit.edu ServerAlias chatter - DocumentRoot /afs/athena.mit.edu/user/e/s/eschmidt/web_scripts/chatter - Alias /~eschmidt /afs/athena.mit.edu/user/e/s/eschmidt/web_scripts - SuExecUserGroup eschmidt eschmidt + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/chatter.pem @@ -24,7 +11,5 @@ ServerName chatter.mit.edu ServerAlias chatter - DocumentRoot /afs/athena.mit.edu/user/e/s/eschmidt/web_scripts/chatter - Alias /~eschmidt /afs/athena.mit.edu/user/e/s/eschmidt/web_scripts - SuExecUserGroup eschmidt eschmidt + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/classof2014.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/classof2014.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/classof2014.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName classof2014.mit.edu - ServerAlias classof2014 - DocumentRoot /afs/athena.mit.edu/activity/other/2014/web_scripts - Alias /~2014 /afs/athena.mit.edu/activity/other/2014/web_scripts - SuExecUserGroup 2014 2014 - Include conf.d/vhosts-common.conf - - ServerName classof2014.mit.edu ServerAlias classof2014 - DocumentRoot /afs/athena.mit.edu/activity/other/2014/web_scripts - Alias /~2014 /afs/athena.mit.edu/activity/other/2014/web_scripts - SuExecUserGroup 2014 2014 + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/classof2014.pem @@ -24,7 +11,5 @@ ServerName classof2014.mit.edu ServerAlias classof2014 - DocumentRoot /afs/athena.mit.edu/activity/other/2014/web_scripts - Alias /~2014 /afs/athena.mit.edu/activity/other/2014/web_scripts - SuExecUserGroup 2014 2014 + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/conner4.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/conner4.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/conner4.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName conner4.mit.edu - ServerAlias conner4 - DocumentRoot /afs/athena.mit.edu/activity/c/conner4/web_scripts/c4web - Alias /~conner4 /afs/athena.mit.edu/activity/c/conner4/web_scripts - SuExecUserGroup conner4 conner4 - Include conf.d/vhosts-common.conf - - ServerName conner4.mit.edu ServerAlias conner4 - DocumentRoot /afs/athena.mit.edu/activity/c/conner4/web_scripts/c4web - Alias /~conner4 /afs/athena.mit.edu/activity/c/conner4/web_scripts - SuExecUserGroup conner4 conner4 + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/conner4.pem @@ -24,7 +11,5 @@ ServerName conner4.mit.edu ServerAlias conner4 - DocumentRoot /afs/athena.mit.edu/activity/c/conner4/web_scripts/c4web - Alias /~conner4 /afs/athena.mit.edu/activity/c/conner4/web_scripts - SuExecUserGroup conner4 conner4 + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/cons.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/cons.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/cons.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName cons.mit.edu - ServerAlias cons - DocumentRoot /afs/athena.mit.edu/course/6/6.035/web_scripts - Alias /~6.035 /afs/athena.mit.edu/course/6/6.035/web_scripts - SuExecUserGroup 6.035 6.035 - Include conf.d/vhosts-common.conf - - ServerName cons.mit.edu ServerAlias cons - DocumentRoot /afs/athena.mit.edu/course/6/6.035/web_scripts - Alias /~6.035 /afs/athena.mit.edu/course/6/6.035/web_scripts - SuExecUserGroup 6.035 6.035 + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/cons.pem @@ -24,7 +11,5 @@ ServerName cons.mit.edu ServerAlias cons - DocumentRoot /afs/athena.mit.edu/course/6/6.035/web_scripts - Alias /~6.035 /afs/athena.mit.edu/course/6/6.035/web_scripts - SuExecUserGroup 6.035 6.035 + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/cosmic-turtle.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/cosmic-turtle.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/cosmic-turtle.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName cosmic-turtle.mit.edu - ServerAlias cosmic-turtle - DocumentRoot /afs/athena.mit.edu/user/b/t/btidor/web_scripts - Alias /~btidor /afs/athena.mit.edu/user/b/t/btidor/web_scripts - SuExecUserGroup btidor btidor - Include conf.d/vhosts-common.conf - - ServerName cosmic-turtle.mit.edu ServerAlias cosmic-turtle - DocumentRoot /afs/athena.mit.edu/user/b/t/btidor/web_scripts - Alias /~btidor /afs/athena.mit.edu/user/b/t/btidor/web_scripts - SuExecUserGroup btidor btidor + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/cosmic-turtle.pem @@ -24,7 +11,5 @@ ServerName cosmic-turtle.mit.edu ServerAlias cosmic-turtle - DocumentRoot /afs/athena.mit.edu/user/b/t/btidor/web_scripts - Alias /~btidor /afs/athena.mit.edu/user/b/t/btidor/web_scripts - SuExecUserGroup btidor btidor + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/courseroad.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/courseroad.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/courseroad.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName courseroad.mit.edu - ServerAlias courseroad - DocumentRoot /afs/athena.mit.edu/user/d/a/dannybd/web_scripts/courseroad - Alias /~dannybd /afs/athena.mit.edu/user/d/a/dannybd/web_scripts - SuExecUserGroup dannybd dannybd - Include conf.d/vhosts-common.conf - - ServerName courseroad.mit.edu ServerAlias courseroad - DocumentRoot /afs/athena.mit.edu/user/d/a/dannybd/web_scripts/courseroad - Alias /~dannybd /afs/athena.mit.edu/user/d/a/dannybd/web_scripts - SuExecUserGroup dannybd dannybd + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/courseroad.pem @@ -24,7 +11,5 @@ ServerName courseroad.mit.edu ServerAlias courseroad - DocumentRoot /afs/athena.mit.edu/user/d/a/dannybd/web_scripts/courseroad - Alias /~dannybd /afs/athena.mit.edu/user/d/a/dannybd/web_scripts - SuExecUserGroup dannybd dannybd + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/crew.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/crew.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/crew.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName crew.mit.edu - ServerAlias crew - DocumentRoot /afs/athena.mit.edu/activity/m/mitcrew/web_scripts - Alias /~mitcrew /afs/athena.mit.edu/activity/m/mitcrew/web_scripts - SuExecUserGroup mitcrew mitcrew - Include conf.d/vhosts-common.conf - - ServerName crew.mit.edu ServerAlias crew - DocumentRoot /afs/athena.mit.edu/activity/m/mitcrew/web_scripts - Alias /~mitcrew /afs/athena.mit.edu/activity/m/mitcrew/web_scripts - SuExecUserGroup mitcrew mitcrew + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/crew.pem @@ -24,7 +11,5 @@ ServerName crew.mit.edu ServerAlias crew - DocumentRoot /afs/athena.mit.edu/activity/m/mitcrew/web_scripts - Alias /~mitcrew /afs/athena.mit.edu/activity/m/mitcrew/web_scripts - SuExecUserGroup mitcrew mitcrew + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/crush.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/crush.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/crush.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName crush.mit.edu - ServerAlias crush - DocumentRoot /afs/athena.mit.edu/user/w/h/whaack/web_scripts/crush - Alias /~whaack /afs/athena.mit.edu/user/w/h/whaack/web_scripts - SuExecUserGroup whaack whaack - Include conf.d/vhosts-common.conf - - ServerName crush.mit.edu ServerAlias crush - DocumentRoot /afs/athena.mit.edu/user/w/h/whaack/web_scripts/crush - Alias /~whaack /afs/athena.mit.edu/user/w/h/whaack/web_scripts - SuExecUserGroup whaack whaack + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/crush.pem @@ -24,7 +11,5 @@ ServerName crush.mit.edu ServerAlias crush - DocumentRoot /afs/athena.mit.edu/user/w/h/whaack/web_scripts/crush - Alias /~whaack /afs/athena.mit.edu/user/w/h/whaack/web_scripts - SuExecUserGroup whaack whaack + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/cs6090.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/cs6090.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/cs6090.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName cs6090.mit.edu - ServerAlias cs6090 - DocumentRoot /afs/athena.mit.edu/course/6/6.177/web_scripts - Alias /~6.177 /afs/athena.mit.edu/course/6/6.177/web_scripts - SuExecUserGroup 6.177 6.177 - Include conf.d/vhosts-common.conf - - ServerName cs6090.mit.edu ServerAlias cs6090 - DocumentRoot /afs/athena.mit.edu/course/6/6.177/web_scripts - Alias /~6.177 /afs/athena.mit.edu/course/6/6.177/web_scripts - SuExecUserGroup 6.177 6.177 + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/cs6090.pem @@ -24,7 +11,5 @@ ServerName cs6090.mit.edu ServerAlias cs6090 - DocumentRoot /afs/athena.mit.edu/course/6/6.177/web_scripts - Alias /~6.177 /afs/athena.mit.edu/course/6/6.177/web_scripts - SuExecUserGroup 6.177 6.177 + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/cycling.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/cycling.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/cycling.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName cycling.mit.edu - ServerAlias cycling - DocumentRoot /afs/athena.mit.edu/activity/c/cycling-club/web_scripts - Alias /~cycling-club /afs/athena.mit.edu/activity/c/cycling-club/web_scripts - SuExecUserGroup cycling-club cycling-club - Include conf.d/vhosts-common.conf - - ServerName cycling.mit.edu ServerAlias cycling - DocumentRoot /afs/athena.mit.edu/activity/c/cycling-club/web_scripts - Alias /~cycling-club /afs/athena.mit.edu/activity/c/cycling-club/web_scripts - SuExecUserGroup cycling-club cycling-club + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/cycling.pem @@ -24,7 +11,5 @@ ServerName cycling.mit.edu ServerAlias cycling - DocumentRoot /afs/athena.mit.edu/activity/c/cycling-club/web_scripts - Alias /~cycling-club /afs/athena.mit.edu/activity/c/cycling-club/web_scripts - SuExecUserGroup cycling-club cycling-club + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/davidben.net.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/davidben.net.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/davidben.net.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName davidben.net - - DocumentRoot /afs/athena.mit.edu/user/d/a/davidben/web_scripts - Alias /~davidben /afs/athena.mit.edu/user/d/a/davidben/web_scripts - SuExecUserGroup davidben davidben - Include conf.d/vhosts-common.conf - - ServerName davidben.net - DocumentRoot /afs/athena.mit.edu/user/d/a/davidben/web_scripts - Alias /~davidben /afs/athena.mit.edu/user/d/a/davidben/web_scripts - SuExecUserGroup davidben davidben + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/davidben.net.pem @@ -24,7 +11,5 @@ ServerName davidben.net - DocumentRoot /afs/athena.mit.edu/user/d/a/davidben/web_scripts - Alias /~davidben /afs/athena.mit.edu/user/d/a/davidben/web_scripts - SuExecUserGroup davidben davidben + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/dchang.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/dchang.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/dchang.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName dchang.mit.edu - ServerAlias dchang - DocumentRoot /afs/athena.mit.edu/user/d/c/dchang/web_scripts - Alias /~dchang /afs/athena.mit.edu/user/d/c/dchang/web_scripts - SuExecUserGroup dchang dchang - Include conf.d/vhosts-common.conf - - ServerName dchang.mit.edu ServerAlias dchang - DocumentRoot /afs/athena.mit.edu/user/d/c/dchang/web_scripts - Alias /~dchang /afs/athena.mit.edu/user/d/c/dchang/web_scripts - SuExecUserGroup dchang dchang + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/dchang.pem @@ -24,7 +11,5 @@ ServerName dchang.mit.edu ServerAlias dchang - DocumentRoot /afs/athena.mit.edu/user/d/c/dchang/web_scripts - Alias /~dchang /afs/athena.mit.edu/user/d/c/dchang/web_scripts - SuExecUserGroup dchang dchang + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/debathena.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/debathena.conf (revision 2730) +++ 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 Index: trunk/server/fedora/config/etc/httpd/vhosts.d/digitalstructures.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/digitalstructures.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/digitalstructures.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName digitalstructures.mit.edu - ServerAlias digitalstructures - DocumentRoot /afs/athena.mit.edu/org/d/digistruct/web_scripts - Alias /~digistruct /afs/athena.mit.edu/org/d/digistruct/web_scripts - SuExecUserGroup digistruct digistruct - Include conf.d/vhosts-common.conf - - ServerName digitalstructures.mit.edu ServerAlias digitalstructures - DocumentRoot /afs/athena.mit.edu/org/d/digistruct/web_scripts - Alias /~digistruct /afs/athena.mit.edu/org/d/digistruct/web_scripts - SuExecUserGroup digistruct digistruct + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/digitalstructures.pem @@ -24,7 +11,5 @@ ServerName digitalstructures.mit.edu ServerAlias digitalstructures - DocumentRoot /afs/athena.mit.edu/org/d/digistruct/web_scripts - Alias /~digistruct /afs/athena.mit.edu/org/d/digistruct/web_scripts - SuExecUserGroup digistruct digistruct + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/dnd.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/dnd.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/dnd.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName dnd.mit.edu - ServerAlias dnd - DocumentRoot /afs/athena.mit.edu/user/d/v/dvorak42/web_scripts/dnd - Alias /~dvorak42 /afs/athena.mit.edu/user/d/v/dvorak42/web_scripts - SuExecUserGroup dvorak42 dvorak42 - Include conf.d/vhosts-common.conf - - ServerName dnd.mit.edu ServerAlias dnd - DocumentRoot /afs/athena.mit.edu/user/d/v/dvorak42/web_scripts/dnd - Alias /~dvorak42 /afs/athena.mit.edu/user/d/v/dvorak42/web_scripts - SuExecUserGroup dvorak42 dvorak42 + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/dnd.pem @@ -24,7 +11,5 @@ ServerName dnd.mit.edu ServerAlias dnd - DocumentRoot /afs/athena.mit.edu/user/d/v/dvorak42/web_scripts/dnd - Alias /~dvorak42 /afs/athena.mit.edu/user/d/v/dvorak42/web_scripts - SuExecUserGroup dvorak42 dvorak42 + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/donut-api.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/donut-api.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/donut-api.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName donut-api.mit.edu - ServerAlias donut-api - DocumentRoot /afs/athena.mit.edu/user/j/d/jdreed/web_scripts/donut-api - Alias /~jdreed /afs/athena.mit.edu/user/j/d/jdreed/web_scripts - SuExecUserGroup jdreed jdreed - Include conf.d/vhosts-common.conf - - ServerName donut-api.mit.edu ServerAlias donut-api - DocumentRoot /afs/athena.mit.edu/user/j/d/jdreed/web_scripts/donut-api - Alias /~jdreed /afs/athena.mit.edu/user/j/d/jdreed/web_scripts - SuExecUserGroup jdreed jdreed + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/donut-api.pem @@ -24,7 +11,5 @@ ServerName donut-api.mit.edu ServerAlias donut-api - DocumentRoot /afs/athena.mit.edu/user/j/d/jdreed/web_scripts/donut-api - Alias /~jdreed /afs/athena.mit.edu/user/j/d/jdreed/web_scripts - SuExecUserGroup jdreed jdreed + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/dormbase.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/dormbase.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/dormbase.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName dormbase.mit.edu - ServerAlias dormbase - DocumentRoot /afs/sipb.mit.edu/project/dormbase/web_scripts - Alias /~dormbase /afs/sipb.mit.edu/project/dormbase/web_scripts - SuExecUserGroup dormbase dormbase - Include conf.d/vhosts-common.conf - - ServerName dormbase.mit.edu ServerAlias dormbase - DocumentRoot /afs/sipb.mit.edu/project/dormbase/web_scripts - Alias /~dormbase /afs/sipb.mit.edu/project/dormbase/web_scripts - SuExecUserGroup dormbase dormbase + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/dormbase.pem @@ -24,7 +11,5 @@ ServerName dormbase.mit.edu ServerAlias dormbase - DocumentRoot /afs/sipb.mit.edu/project/dormbase/web_scripts - Alias /~dormbase /afs/sipb.mit.edu/project/dormbase/web_scripts - SuExecUserGroup dormbase dormbase + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/eastgate.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/eastgate.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/eastgate.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName eastgate.mit.edu - ServerAlias eastgate - DocumentRoot /afs/athena.mit.edu/activity/e/eastgate/web_scripts - Alias /~eastgate /afs/athena.mit.edu/activity/e/eastgate/web_scripts - SuExecUserGroup eastgate eastgate - Include conf.d/vhosts-common.conf - - ServerName eastgate.mit.edu ServerAlias eastgate - DocumentRoot /afs/athena.mit.edu/activity/e/eastgate/web_scripts - Alias /~eastgate /afs/athena.mit.edu/activity/e/eastgate/web_scripts - SuExecUserGroup eastgate eastgate + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/eastgate.pem @@ -24,7 +11,5 @@ ServerName eastgate.mit.edu ServerAlias eastgate - DocumentRoot /afs/athena.mit.edu/activity/e/eastgate/web_scripts - Alias /~eastgate /afs/athena.mit.edu/activity/e/eastgate/web_scripts - SuExecUserGroup eastgate eastgate + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/ec.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/ec.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/ec.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName ec.mit.edu - ServerAlias ec - DocumentRoot /afs/athena.mit.edu/activity/e/ec/web_scripts - Alias /~ec /afs/athena.mit.edu/activity/e/ec/web_scripts - SuExecUserGroup ec ec - Include conf.d/vhosts-common.conf - - ServerName ec.mit.edu ServerAlias ec - DocumentRoot /afs/athena.mit.edu/activity/e/ec/web_scripts - Alias /~ec /afs/athena.mit.edu/activity/e/ec/web_scripts - SuExecUserGroup ec ec + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/ec.pem @@ -24,7 +11,5 @@ ServerName ec.mit.edu ServerAlias ec - DocumentRoot /afs/athena.mit.edu/activity/e/ec/web_scripts - Alias /~ec /afs/athena.mit.edu/activity/e/ec/web_scripts - SuExecUserGroup ec ec + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/edudesignshop.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/edudesignshop.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/edudesignshop.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName edudesignshop.mit.edu - ServerAlias edudesignshop - DocumentRoot /afs/athena.mit.edu/course/urop/edudesignshop/web_scripts - Alias /~edudesignshop /afs/athena.mit.edu/course/urop/edudesignshop/web_scripts - SuExecUserGroup edudesignshop edudesignshop - Include conf.d/vhosts-common.conf - - ServerName edudesignshop.mit.edu ServerAlias edudesignshop - DocumentRoot /afs/athena.mit.edu/course/urop/edudesignshop/web_scripts - Alias /~edudesignshop /afs/athena.mit.edu/course/urop/edudesignshop/web_scripts - SuExecUserGroup edudesignshop edudesignshop + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/edudesignshop.pem @@ -24,7 +11,5 @@ ServerName edudesignshop.mit.edu ServerAlias edudesignshop - DocumentRoot /afs/athena.mit.edu/course/urop/edudesignshop/web_scripts - Alias /~edudesignshop /afs/athena.mit.edu/course/urop/edudesignshop/web_scripts - SuExecUserGroup edudesignshop edudesignshop + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/emit.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/emit.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/emit.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName emit.mit.edu - ServerAlias emit - DocumentRoot /afs/athena.mit.edu/activity/c/commit/web_scripts/blog - Alias /~commit /afs/athena.mit.edu/activity/c/commit/web_scripts - SuExecUserGroup commit commit - Include conf.d/vhosts-common.conf - - ServerName emit.mit.edu ServerAlias emit - DocumentRoot /afs/athena.mit.edu/activity/c/commit/web_scripts/blog - Alias /~commit /afs/athena.mit.edu/activity/c/commit/web_scripts - SuExecUserGroup commit commit + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/emit.pem @@ -24,7 +11,5 @@ ServerName emit.mit.edu ServerAlias emit - DocumentRoot /afs/athena.mit.edu/activity/c/commit/web_scripts/blog - Alias /~commit /afs/athena.mit.edu/activity/c/commit/web_scripts - SuExecUserGroup commit commit + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/familynet.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/familynet.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/familynet.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName familynet.mit.edu - ServerAlias familynet - DocumentRoot /afs/athena.mit.edu/org/f/familynet/web_scripts - Alias /~familynet /afs/athena.mit.edu/org/f/familynet/web_scripts - SuExecUserGroup familynet familynet - Include conf.d/vhosts-common.conf - - ServerName familynet.mit.edu ServerAlias familynet - DocumentRoot /afs/athena.mit.edu/org/f/familynet/web_scripts - Alias /~familynet /afs/athena.mit.edu/org/f/familynet/web_scripts - SuExecUserGroup familynet familynet + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/familynet.pem @@ -24,7 +11,5 @@ ServerName familynet.mit.edu ServerAlias familynet - DocumentRoot /afs/athena.mit.edu/org/f/familynet/web_scripts - Alias /~familynet /afs/athena.mit.edu/org/f/familynet/web_scripts - SuExecUserGroup familynet familynet + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/feed.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/feed.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/feed.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName feed.mit.edu - ServerAlias feed - DocumentRoot /afs/sipb.mit.edu/project/feed/web_scripts - Alias /~feed /afs/sipb.mit.edu/project/feed/web_scripts - SuExecUserGroup feed feed - Include conf.d/vhosts-common.conf - - ServerName feed.mit.edu ServerAlias feed - DocumentRoot /afs/sipb.mit.edu/project/feed/web_scripts - Alias /~feed /afs/sipb.mit.edu/project/feed/web_scripts - SuExecUserGroup feed feed + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/feed.pem @@ -24,7 +11,5 @@ ServerName feed.mit.edu ServerAlias feed - DocumentRoot /afs/sipb.mit.edu/project/feed/web_scripts - Alias /~feed /afs/sipb.mit.edu/project/feed/web_scripts - SuExecUserGroup feed feed + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/finboard.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/finboard.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/finboard.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName finboard.mit.edu - ServerAlias finboard - DocumentRoot /afs/athena.mit.edu/activity/f/finboard/web_scripts/finboard - Alias /~finboard /afs/athena.mit.edu/activity/f/finboard/web_scripts - SuExecUserGroup finboard finboard - Include conf.d/vhosts-common.conf - - ServerName finboard.mit.edu ServerAlias finboard - DocumentRoot /afs/athena.mit.edu/activity/f/finboard/web_scripts/finboard - Alias /~finboard /afs/athena.mit.edu/activity/f/finboard/web_scripts - SuExecUserGroup finboard finboard + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/finboard.pem @@ -24,7 +11,5 @@ ServerName finboard.mit.edu ServerAlias finboard - DocumentRoot /afs/athena.mit.edu/activity/f/finboard/web_scripts/finboard - Alias /~finboard /afs/athena.mit.edu/activity/f/finboard/web_scripts - SuExecUserGroup finboard finboard + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/fridget.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/fridget.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/fridget.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName fridget.mit.edu - ServerAlias fridget - DocumentRoot /afs/athena.mit.edu/user/k/r/kristjan/web_scripts/fridget - Alias /~kristjan /afs/athena.mit.edu/user/k/r/kristjan/web_scripts - SuExecUserGroup kristjan kristjan - Include conf.d/vhosts-common.conf - - ServerName fridget.mit.edu ServerAlias fridget - DocumentRoot /afs/athena.mit.edu/user/k/r/kristjan/web_scripts/fridget - Alias /~kristjan /afs/athena.mit.edu/user/k/r/kristjan/web_scripts - SuExecUserGroup kristjan kristjan + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/fridget.pem @@ -24,7 +11,5 @@ ServerName fridget.mit.edu ServerAlias fridget - DocumentRoot /afs/athena.mit.edu/user/k/r/kristjan/web_scripts/fridget - Alias /~kristjan /afs/athena.mit.edu/user/k/r/kristjan/web_scripts - SuExecUserGroup kristjan kristjan + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/gsc.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/gsc.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/gsc.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName gsc.mit.edu - ServerAlias gsc - DocumentRoot /afs/athena.mit.edu/activity/g/gsc/web_scripts - Alias /~gsc /afs/athena.mit.edu/activity/g/gsc/web_scripts - SuExecUserGroup gsc gsc - Include conf.d/vhosts-common.conf - - ServerName gsc.mit.edu ServerAlias gsc - DocumentRoot /afs/athena.mit.edu/activity/g/gsc/web_scripts - Alias /~gsc /afs/athena.mit.edu/activity/g/gsc/web_scripts - SuExecUserGroup gsc gsc + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/gsc.pem @@ -24,7 +11,5 @@ ServerName gsc.mit.edu ServerAlias gsc - DocumentRoot /afs/athena.mit.edu/activity/g/gsc/web_scripts - Alias /~gsc /afs/athena.mit.edu/activity/g/gsc/web_scripts - SuExecUserGroup gsc gsc + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/hmmt.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/hmmt.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/hmmt.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName hmmt.mit.edu - ServerAlias hmmt - DocumentRoot /afs/athena.mit.edu/activity/h/hmmt/web_scripts - Alias /~hmmt /afs/athena.mit.edu/activity/h/hmmt/web_scripts - SuExecUserGroup hmmt hmmt - Include conf.d/vhosts-common.conf - - ServerName hmmt.mit.edu ServerAlias hmmt - DocumentRoot /afs/athena.mit.edu/activity/h/hmmt/web_scripts - Alias /~hmmt /afs/athena.mit.edu/activity/h/hmmt/web_scripts - SuExecUserGroup hmmt hmmt + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/hmmt.pem @@ -24,7 +11,5 @@ ServerName hmmt.mit.edu ServerAlias hmmt - DocumentRoot /afs/athena.mit.edu/activity/h/hmmt/web_scripts - Alias /~hmmt /afs/athena.mit.edu/activity/h/hmmt/web_scripts - SuExecUserGroup hmmt hmmt + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/impact.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/impact.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/impact.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName impact.mit.edu - ServerAlias impact - DocumentRoot /afs/athena.mit.edu/org/m/mitimpact/web_scripts - Alias /~mitimpact /afs/athena.mit.edu/org/m/mitimpact/web_scripts - SuExecUserGroup mitimpact mitimpact - Include conf.d/vhosts-common.conf - - ServerName impact.mit.edu ServerAlias impact - DocumentRoot /afs/athena.mit.edu/org/m/mitimpact/web_scripts - Alias /~mitimpact /afs/athena.mit.edu/org/m/mitimpact/web_scripts - SuExecUserGroup mitimpact mitimpact + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/impact.pem @@ -24,7 +11,5 @@ ServerName impact.mit.edu ServerAlias impact - DocumentRoot /afs/athena.mit.edu/org/m/mitimpact/web_scripts - Alias /~mitimpact /afs/athena.mit.edu/org/m/mitimpact/web_scripts - SuExecUserGroup mitimpact mitimpact + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/isa.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/isa.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/isa.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName isa.mit.edu - ServerAlias isa - DocumentRoot /afs/athena.mit.edu/activity/i/isa/web_scripts - Alias /~isa /afs/athena.mit.edu/activity/i/isa/web_scripts - SuExecUserGroup isa isa - Include conf.d/vhosts-common.conf - - ServerName isa.mit.edu ServerAlias isa - DocumentRoot /afs/athena.mit.edu/activity/i/isa/web_scripts - Alias /~isa /afs/athena.mit.edu/activity/i/isa/web_scripts - SuExecUserGroup isa isa + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/isa.pem @@ -24,7 +11,5 @@ ServerName isa.mit.edu ServerAlias isa - DocumentRoot /afs/athena.mit.edu/activity/i/isa/web_scripts - Alias /~isa /afs/athena.mit.edu/activity/i/isa/web_scripts - SuExecUserGroup isa isa + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/isawyou.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/isawyou.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/isawyou.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName isawyou.mit.edu - ServerAlias isawyou - DocumentRoot /afs/sipb.mit.edu/contrib/isawyou/web_scripts - Alias /~isawyou /afs/sipb.mit.edu/contrib/isawyou/web_scripts - SuExecUserGroup isawyou isawyou - Include conf.d/vhosts-common.conf - - ServerName isawyou.mit.edu ServerAlias isawyou - DocumentRoot /afs/sipb.mit.edu/contrib/isawyou/web_scripts - Alias /~isawyou /afs/sipb.mit.edu/contrib/isawyou/web_scripts - SuExecUserGroup isawyou isawyou + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/isawyou.pem @@ -24,7 +11,5 @@ ServerName isawyou.mit.edu ServerAlias isawyou - DocumentRoot /afs/sipb.mit.edu/contrib/isawyou/web_scripts - Alias /~isawyou /afs/sipb.mit.edu/contrib/isawyou/web_scripts - SuExecUserGroup isawyou isawyou + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/la-casa.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/la-casa.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/la-casa.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName la-casa.mit.edu - ServerAlias la-casa - DocumentRoot /afs/athena.mit.edu/activity/l/la_casa/web_scripts - Alias /~la_casa /afs/athena.mit.edu/activity/l/la_casa/web_scripts - SuExecUserGroup la_casa la_casa - Include conf.d/vhosts-common.conf - - ServerName la-casa.mit.edu ServerAlias la-casa - DocumentRoot /afs/athena.mit.edu/activity/l/la_casa/web_scripts - Alias /~la_casa /afs/athena.mit.edu/activity/l/la_casa/web_scripts - SuExecUserGroup la_casa la_casa + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/la-casa.pem @@ -24,7 +11,5 @@ ServerName la-casa.mit.edu ServerAlias la-casa - DocumentRoot /afs/athena.mit.edu/activity/l/la_casa/web_scripts - Alias /~la_casa /afs/athena.mit.edu/activity/l/la_casa/web_scripts - SuExecUserGroup la_casa la_casa + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/ldpreload.com.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/ldpreload.com.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/ldpreload.com.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName ldpreload.com - ServerAlias www.ldpreload.com - DocumentRoot /afs/athena.mit.edu/user/g/e/geofft/web_scripts/geofft - Alias /~geofft /afs/athena.mit.edu/user/g/e/geofft/web_scripts - SuExecUserGroup geofft geofft - Include conf.d/vhosts-common.conf - - ServerName ldpreload.com ServerAlias www.ldpreload.com - DocumentRoot /afs/athena.mit.edu/user/g/e/geofft/web_scripts/geofft - Alias /~geofft /afs/athena.mit.edu/user/g/e/geofft/web_scripts - SuExecUserGroup geofft geofft + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/ldpreload.com.pem @@ -24,7 +11,5 @@ ServerName ldpreload.com ServerAlias www.ldpreload.com - DocumentRoot /afs/athena.mit.edu/user/g/e/geofft/web_scripts/geofft - Alias /~geofft /afs/athena.mit.edu/user/g/e/geofft/web_scripts - SuExecUserGroup geofft geofft + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/leee.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/leee.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/leee.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName leee.mit.edu - ServerAlias leee - DocumentRoot /afs/athena.mit.edu/user/l/e/leee/web_scripts/lee - Alias /~leee /afs/athena.mit.edu/user/l/e/leee/web_scripts - SuExecUserGroup leee leee - Include conf.d/vhosts-common.conf - - ServerName leee.mit.edu ServerAlias leee - DocumentRoot /afs/athena.mit.edu/user/l/e/leee/web_scripts/lee - Alias /~leee /afs/athena.mit.edu/user/l/e/leee/web_scripts - SuExecUserGroup leee leee + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/leee.pem @@ -24,7 +11,5 @@ ServerName leee.mit.edu ServerAlias leee - DocumentRoot /afs/athena.mit.edu/user/l/e/leee/web_scripts/lee - Alias /~leee /afs/athena.mit.edu/user/l/e/leee/web_scripts - SuExecUserGroup leee leee + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/legendary.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/legendary.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/legendary.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName legendary.mit.edu - ServerAlias legendary - DocumentRoot /afs/athena.mit.edu/user/c/o/colinmcd/web_scripts/skills - Alias /~colinmcd /afs/athena.mit.edu/user/c/o/colinmcd/web_scripts - SuExecUserGroup colinmcd colinmcd - Include conf.d/vhosts-common.conf - - ServerName legendary.mit.edu ServerAlias legendary - DocumentRoot /afs/athena.mit.edu/user/c/o/colinmcd/web_scripts/skills - Alias /~colinmcd /afs/athena.mit.edu/user/c/o/colinmcd/web_scripts - SuExecUserGroup colinmcd colinmcd + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/legendary.pem @@ -24,7 +11,5 @@ ServerName legendary.mit.edu ServerAlias legendary - DocumentRoot /afs/athena.mit.edu/user/c/o/colinmcd/web_scripts/skills - Alias /~colinmcd /afs/athena.mit.edu/user/c/o/colinmcd/web_scripts - SuExecUserGroup colinmcd colinmcd + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/linguistics.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/linguistics.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/linguistics.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName linguistics.mit.edu - ServerAlias linguistics - DocumentRoot /afs/athena.mit.edu/org/l/lingapps/web_scripts - Alias /~lingapps /afs/athena.mit.edu/org/l/lingapps/web_scripts - SuExecUserGroup lingapps lingapps - Include conf.d/vhosts-common.conf - - ServerName linguistics.mit.edu ServerAlias linguistics - DocumentRoot /afs/athena.mit.edu/org/l/lingapps/web_scripts - Alias /~lingapps /afs/athena.mit.edu/org/l/lingapps/web_scripts - SuExecUserGroup lingapps lingapps + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/linguistics.pem @@ -24,7 +11,5 @@ ServerName linguistics.mit.edu ServerAlias linguistics - DocumentRoot /afs/athena.mit.edu/org/l/lingapps/web_scripts - Alias /~lingapps /afs/athena.mit.edu/org/l/lingapps/web_scripts - SuExecUserGroup lingapps lingapps + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/listmon.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/listmon.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/listmon.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName listmon.mit.edu - ServerAlias listmon - DocumentRoot /afs/athena.mit.edu/user/a/s/aseering/web_scripts/listmon - Alias /~aseering /afs/athena.mit.edu/user/a/s/aseering/web_scripts - SuExecUserGroup aseering aseering - Include conf.d/vhosts-common.conf - - ServerName listmon.mit.edu ServerAlias listmon - DocumentRoot /afs/athena.mit.edu/user/a/s/aseering/web_scripts/listmon - Alias /~aseering /afs/athena.mit.edu/user/a/s/aseering/web_scripts - SuExecUserGroup aseering aseering + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/listmon.pem @@ -24,7 +11,5 @@ ServerName listmon.mit.edu ServerAlias listmon - DocumentRoot /afs/athena.mit.edu/user/a/s/aseering/web_scripts/listmon - Alias /~aseering /afs/athena.mit.edu/user/a/s/aseering/web_scripts - SuExecUserGroup aseering aseering + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/liyan.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/liyan.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/liyan.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName liyan.mit.edu - ServerAlias liyan - DocumentRoot /afs/athena.mit.edu/user/d/c/dchang/web_scripts - Alias /~dchang /afs/athena.mit.edu/user/d/c/dchang/web_scripts - SuExecUserGroup dchang dchang - Include conf.d/vhosts-common.conf - - ServerName liyan.mit.edu ServerAlias liyan - DocumentRoot /afs/athena.mit.edu/user/d/c/dchang/web_scripts - Alias /~dchang /afs/athena.mit.edu/user/d/c/dchang/web_scripts - SuExecUserGroup dchang dchang + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/liyan.pem @@ -24,7 +11,5 @@ ServerName liyan.mit.edu ServerAlias liyan - DocumentRoot /afs/athena.mit.edu/user/d/c/dchang/web_scripts - Alias /~dchang /afs/athena.mit.edu/user/d/c/dchang/web_scripts - SuExecUserGroup dchang dchang + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/lizdenys.com.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/lizdenys.com.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/lizdenys.com.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName lizdenys.com - - DocumentRoot /afs/athena.mit.edu/user/l/i/lizdenys/web_scripts/www - Alias /~lizdenys /afs/athena.mit.edu/user/l/i/lizdenys/web_scripts - SuExecUserGroup lizdenys lizdenys - Include conf.d/vhosts-common.conf - - ServerName lizdenys.com - DocumentRoot /afs/athena.mit.edu/user/l/i/lizdenys/web_scripts/www - Alias /~lizdenys /afs/athena.mit.edu/user/l/i/lizdenys/web_scripts - SuExecUserGroup lizdenys lizdenys + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/star.lizdenys.com.pem @@ -24,7 +11,5 @@ ServerName lizdenys.com - DocumentRoot /afs/athena.mit.edu/user/l/i/lizdenys/web_scripts/www - Alias /~lizdenys /afs/athena.mit.edu/user/l/i/lizdenys/web_scripts - SuExecUserGroup lizdenys lizdenys + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf @@ -33,22 +18,9 @@ -# do not trailing-slash DocumentRoot - - - ServerName blog.lizdenys.com - - DocumentRoot /afs/athena.mit.edu/user/l/i/lizdenys/web_scripts/blog - Alias /~lizdenys /afs/athena.mit.edu/user/l/i/lizdenys/web_scripts - SuExecUserGroup lizdenys lizdenys - Include conf.d/vhosts-common.conf - - ServerName blog.lizdenys.com - DocumentRoot /afs/athena.mit.edu/user/l/i/lizdenys/web_scripts/blog - Alias /~lizdenys /afs/athena.mit.edu/user/l/i/lizdenys/web_scripts - SuExecUserGroup lizdenys lizdenys + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/star.lizdenys.com.pem @@ -58,7 +30,5 @@ ServerName blog.lizdenys.com - DocumentRoot /afs/athena.mit.edu/user/l/i/lizdenys/web_scripts/blog - Alias /~lizdenys /afs/athena.mit.edu/user/l/i/lizdenys/web_scripts - SuExecUserGroup lizdenys lizdenys + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf @@ -67,22 +37,9 @@ -# do not trailing-slash DocumentRoot - - - ServerName food.lizdenys.com - - DocumentRoot /afs/athena.mit.edu/user/l/i/lizdenys/web_scripts/food - Alias /~lizdenys /afs/athena.mit.edu/user/l/i/lizdenys/web_scripts - SuExecUserGroup lizdenys lizdenys - Include conf.d/vhosts-common.conf - - ServerName food.lizdenys.com - DocumentRoot /afs/athena.mit.edu/user/l/i/lizdenys/web_scripts/food - Alias /~lizdenys /afs/athena.mit.edu/user/l/i/lizdenys/web_scripts - SuExecUserGroup lizdenys lizdenys + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/star.lizdenys.com.pem @@ -92,7 +49,5 @@ ServerName food.lizdenys.com - DocumentRoot /afs/athena.mit.edu/user/l/i/lizdenys/web_scripts/food - Alias /~lizdenys /afs/athena.mit.edu/user/l/i/lizdenys/web_scripts - SuExecUserGroup lizdenys lizdenys + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf @@ -101,22 +56,9 @@ -# do not trailing-slash DocumentRoot - - - ServerName haircolor.lizdenys.com - - DocumentRoot /afs/athena.mit.edu/user/l/i/lizdenys/web_scripts/haircolor - Alias /~lizdenys /afs/athena.mit.edu/user/l/i/lizdenys/web_scripts - SuExecUserGroup lizdenys lizdenys - Include conf.d/vhosts-common.conf - - ServerName haircolor.lizdenys.com - DocumentRoot /afs/athena.mit.edu/user/l/i/lizdenys/web_scripts/haircolor - Alias /~lizdenys /afs/athena.mit.edu/user/l/i/lizdenys/web_scripts - SuExecUserGroup lizdenys lizdenys + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/star.lizdenys.com.pem @@ -126,7 +68,5 @@ ServerName haircolor.lizdenys.com - DocumentRoot /afs/athena.mit.edu/user/l/i/lizdenys/web_scripts/haircolor - Alias /~lizdenys /afs/athena.mit.edu/user/l/i/lizdenys/web_scripts - SuExecUserGroup lizdenys lizdenys + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf @@ -135,22 +75,9 @@ -# do not trailing-slash DocumentRoot - - - ServerName www.lizdenys.com - - DocumentRoot /afs/athena.mit.edu/user/l/i/lizdenys/web_scripts/www - Alias /~lizdenys /afs/athena.mit.edu/user/l/i/lizdenys/web_scripts - SuExecUserGroup lizdenys lizdenys - Include conf.d/vhosts-common.conf - - ServerName www.lizdenys.com - DocumentRoot /afs/athena.mit.edu/user/l/i/lizdenys/web_scripts/www - Alias /~lizdenys /afs/athena.mit.edu/user/l/i/lizdenys/web_scripts - SuExecUserGroup lizdenys lizdenys + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/star.lizdenys.com.pem @@ -160,7 +87,5 @@ ServerName www.lizdenys.com - DocumentRoot /afs/athena.mit.edu/user/l/i/lizdenys/web_scripts/www - Alias /~lizdenys /afs/athena.mit.edu/user/l/i/lizdenys/web_scripts - SuExecUserGroup lizdenys lizdenys + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/locate.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/locate.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/locate.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName locate.mit.edu - ServerAlias locate - DocumentRoot /afs/athena.mit.edu/user/b/e/bevacqua/web_scripts/locate - Alias /~bevacqua /afs/athena.mit.edu/user/b/e/bevacqua/web_scripts - SuExecUserGroup bevacqua bevacqua - Include conf.d/vhosts-common.conf - - ServerName locate.mit.edu ServerAlias locate - DocumentRoot /afs/athena.mit.edu/user/b/e/bevacqua/web_scripts/locate - Alias /~bevacqua /afs/athena.mit.edu/user/b/e/bevacqua/web_scripts - SuExecUserGroup bevacqua bevacqua + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/locate.pem @@ -24,7 +11,5 @@ ServerName locate.mit.edu ServerAlias locate - DocumentRoot /afs/athena.mit.edu/user/b/e/bevacqua/web_scripts/locate - Alias /~bevacqua /afs/athena.mit.edu/user/b/e/bevacqua/web_scripts - SuExecUserGroup bevacqua bevacqua + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/log.vasilvv.org.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/log.vasilvv.org.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/log.vasilvv.org.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName log.vasilvv.org - - DocumentRoot /afs/athena.mit.edu/user/v/a/vasilvv/web_scripts/blog - Alias /~vasilvv /afs/athena.mit.edu/user/v/a/vasilvv/web_scripts - SuExecUserGroup vasilvv vasilvv - Include conf.d/vhosts-common.conf - - ServerName log.vasilvv.org - DocumentRoot /afs/athena.mit.edu/user/v/a/vasilvv/web_scripts/blog - Alias /~vasilvv /afs/athena.mit.edu/user/v/a/vasilvv/web_scripts - SuExecUserGroup vasilvv vasilvv + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/log.vasilvv.org.pem @@ -24,7 +11,5 @@ ServerName log.vasilvv.org - DocumentRoot /afs/athena.mit.edu/user/v/a/vasilvv/web_scripts/blog - Alias /~vasilvv /afs/athena.mit.edu/user/v/a/vasilvv/web_scripts - SuExecUserGroup vasilvv vasilvv + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/luke.wf.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/luke.wf.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/luke.wf.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName luke.wf - ServerAlias www.luke.wf - DocumentRoot /afs/athena.mit.edu/user/l/f/lfaraone/web_scripts/lukewf - Alias /~lfaraone /afs/athena.mit.edu/user/l/f/lfaraone/web_scripts - SuExecUserGroup lfaraone lfaraone - Include conf.d/vhosts-common.conf - - ServerName luke.wf ServerAlias www.luke.wf - DocumentRoot /afs/athena.mit.edu/user/l/f/lfaraone/web_scripts/lukewf - Alias /~lfaraone /afs/athena.mit.edu/user/l/f/lfaraone/web_scripts - SuExecUserGroup lfaraone lfaraone + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/luke.wf.pem @@ -24,7 +11,5 @@ ServerName luke.wf ServerAlias www.luke.wf - DocumentRoot /afs/athena.mit.edu/user/l/f/lfaraone/web_scripts/lukewf - Alias /~lfaraone /afs/athena.mit.edu/user/l/f/lfaraone/web_scripts - SuExecUserGroup lfaraone lfaraone + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/madars.org.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/madars.org.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/madars.org.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName madars.org - - DocumentRoot /afs/athena.mit.edu/user/m/a/madars/web_scripts/madars-org - Alias /~madars /afs/athena.mit.edu/user/m/a/madars/web_scripts - SuExecUserGroup madars madars - Include conf.d/vhosts-common.conf - - ServerName madars.org - DocumentRoot /afs/athena.mit.edu/user/m/a/madars/web_scripts/madars-org - Alias /~madars /afs/athena.mit.edu/user/m/a/madars/web_scripts - SuExecUserGroup madars madars + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/madars.org.pem @@ -24,7 +11,5 @@ ServerName madars.org - DocumentRoot /afs/athena.mit.edu/user/m/a/madars/web_scripts/madars-org - Alias /~madars /afs/athena.mit.edu/user/m/a/madars/web_scripts - SuExecUserGroup madars madars + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/mafia-app.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/mafia-app.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/mafia-app.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName mafia-app.mit.edu - ServerAlias mafia-app - DocumentRoot /afs/athena.mit.edu/user/j/a/jakobw/web_scripts/mafia - Alias /~jakobw /afs/athena.mit.edu/user/j/a/jakobw/web_scripts - SuExecUserGroup jakobw jakobw - Include conf.d/vhosts-common.conf - - ServerName mafia-app.mit.edu ServerAlias mafia-app - DocumentRoot /afs/athena.mit.edu/user/j/a/jakobw/web_scripts/mafia - Alias /~jakobw /afs/athena.mit.edu/user/j/a/jakobw/web_scripts - SuExecUserGroup jakobw jakobw + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/mafia-app.pem @@ -24,7 +11,5 @@ ServerName mafia-app.mit.edu ServerAlias mafia-app - DocumentRoot /afs/athena.mit.edu/user/j/a/jakobw/web_scripts/mafia - Alias /~jakobw /afs/athena.mit.edu/user/j/a/jakobw/web_scripts - SuExecUserGroup jakobw jakobw + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/mailto.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/mailto.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/mailto.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName mailto.mit.edu - ServerAlias mailto - DocumentRoot /afs/sipb.mit.edu/project/mailto/web_scripts - Alias /~mailto /afs/sipb.mit.edu/project/mailto/web_scripts - SuExecUserGroup mailto mailto - Include conf.d/vhosts-common.conf - - ServerName mailto.mit.edu ServerAlias mailto - DocumentRoot /afs/sipb.mit.edu/project/mailto/web_scripts - Alias /~mailto /afs/sipb.mit.edu/project/mailto/web_scripts - SuExecUserGroup mailto mailto + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/mailto.pem @@ -24,7 +11,5 @@ ServerName mailto.mit.edu ServerAlias mailto - DocumentRoot /afs/sipb.mit.edu/project/mailto/web_scripts - Alias /~mailto /afs/sipb.mit.edu/project/mailto/web_scripts - SuExecUserGroup mailto mailto + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/maseeh.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/maseeh.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/maseeh.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName maseeh.mit.edu - ServerAlias maseeh - DocumentRoot /afs/athena.mit.edu/activity/m/maseeh/web_scripts/www - Alias /~maseeh /afs/athena.mit.edu/activity/m/maseeh/web_scripts - SuExecUserGroup maseeh maseeh - Include conf.d/vhosts-common.conf - - ServerName maseeh.mit.edu ServerAlias maseeh - DocumentRoot /afs/athena.mit.edu/activity/m/maseeh/web_scripts/www - Alias /~maseeh /afs/athena.mit.edu/activity/m/maseeh/web_scripts - SuExecUserGroup maseeh maseeh + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/maseeh.pem @@ -24,7 +11,5 @@ ServerName maseeh.mit.edu ServerAlias maseeh - DocumentRoot /afs/athena.mit.edu/activity/m/maseeh/web_scripts/www - Alias /~maseeh /afs/athena.mit.edu/activity/m/maseeh/web_scripts - SuExecUserGroup maseeh maseeh + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/metu.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/metu.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/metu.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName metu.mit.edu - ServerAlias metu - DocumentRoot /afs/athena.mit.edu/org/m/metu/web_scripts/openings - Alias /~metu /afs/athena.mit.edu/org/m/metu/web_scripts - SuExecUserGroup metu metu - Include conf.d/vhosts-common.conf - - ServerName metu.mit.edu ServerAlias metu - DocumentRoot /afs/athena.mit.edu/org/m/metu/web_scripts/openings - Alias /~metu /afs/athena.mit.edu/org/m/metu/web_scripts - SuExecUserGroup metu metu + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/metu.pem @@ -24,7 +11,5 @@ ServerName metu.mit.edu ServerAlias metu - DocumentRoot /afs/athena.mit.edu/org/m/metu/web_scripts/openings - Alias /~metu /afs/athena.mit.edu/org/m/metu/web_scripts - SuExecUserGroup metu metu + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/mithub.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/mithub.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/mithub.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName mithub.mit.edu - ServerAlias mithub - DocumentRoot /afs/sipb.mit.edu/project/mithub/web_scripts - Alias /~mithub /afs/sipb.mit.edu/project/mithub/web_scripts - SuExecUserGroup mithub mithub - Include conf.d/vhosts-common.conf - - ServerName mithub.mit.edu ServerAlias mithub - DocumentRoot /afs/sipb.mit.edu/project/mithub/web_scripts - Alias /~mithub /afs/sipb.mit.edu/project/mithub/web_scripts - SuExecUserGroup mithub mithub + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/mithub.pem @@ -24,7 +11,5 @@ ServerName mithub.mit.edu ServerAlias mithub - DocumentRoot /afs/sipb.mit.edu/project/mithub/web_scripts - Alias /~mithub /afs/sipb.mit.edu/project/mithub/web_scripts - SuExecUserGroup mithub mithub + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/mitsoc.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/mitsoc.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/mitsoc.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName mitsoc.mit.edu - ServerAlias mitsoc - DocumentRoot /afs/athena.mit.edu/activity/m/mitsoc/web_scripts - Alias /~mitsoc /afs/athena.mit.edu/activity/m/mitsoc/web_scripts - SuExecUserGroup mitsoc mitsoc - Include conf.d/vhosts-common.conf - - ServerName mitsoc.mit.edu ServerAlias mitsoc - DocumentRoot /afs/athena.mit.edu/activity/m/mitsoc/web_scripts - Alias /~mitsoc /afs/athena.mit.edu/activity/m/mitsoc/web_scripts - SuExecUserGroup mitsoc mitsoc + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/mitsoc.pem @@ -24,7 +11,5 @@ ServerName mitsoc.mit.edu ServerAlias mitsoc - DocumentRoot /afs/athena.mit.edu/activity/m/mitsoc/web_scripts - Alias /~mitsoc /afs/athena.mit.edu/activity/m/mitsoc/web_scripts - SuExecUserGroup mitsoc mitsoc + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/mosh.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/mosh.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/mosh.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName mosh.mit.edu - ServerAlias mosh - DocumentRoot /afs/sipb.mit.edu/project/mosh/web_scripts - Alias /~mosh_project /afs/sipb.mit.edu/project/mosh/web_scripts - SuExecUserGroup mosh_project mosh_project - Include conf.d/vhosts-common.conf - - ServerName mosh.mit.edu ServerAlias mosh - DocumentRoot /afs/sipb.mit.edu/project/mosh/web_scripts - Alias /~mosh_project /afs/sipb.mit.edu/project/mosh/web_scripts - SuExecUserGroup mosh_project mosh_project + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/mosh.pem @@ -24,7 +11,5 @@ ServerName mosh.mit.edu ServerAlias mosh - DocumentRoot /afs/sipb.mit.edu/project/mosh/web_scripts - Alias /~mosh_project /afs/sipb.mit.edu/project/mosh/web_scripts - SuExecUserGroup mosh_project mosh_project + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/next.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/next.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/next.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName next.mit.edu - ServerAlias next - DocumentRoot /afs/athena.mit.edu/activity/n/next/web_scripts/root - Alias /~next /afs/athena.mit.edu/activity/n/next/web_scripts - SuExecUserGroup next next - Include conf.d/vhosts-common.conf - - ServerName next.mit.edu ServerAlias next - DocumentRoot /afs/athena.mit.edu/activity/n/next/web_scripts/root - Alias /~next /afs/athena.mit.edu/activity/n/next/web_scripts - SuExecUserGroup next next + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/next.pem @@ -24,7 +11,5 @@ ServerName next.mit.edu ServerAlias next - DocumentRoot /afs/athena.mit.edu/activity/n/next/web_scripts/root - Alias /~next /afs/athena.mit.edu/activity/n/next/web_scripts - SuExecUserGroup next next + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/ofcourse.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/ofcourse.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/ofcourse.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName ofcourse.mit.edu - ServerAlias ofcourse - DocumentRoot /afs/athena.mit.edu/org/o/ofcourse/web_scripts/ofcourse - Alias /~ofcourse /afs/athena.mit.edu/org/o/ofcourse/web_scripts - SuExecUserGroup ofcourse ofcourse - Include conf.d/vhosts-common.conf - - ServerName ofcourse.mit.edu ServerAlias ofcourse - DocumentRoot /afs/athena.mit.edu/org/o/ofcourse/web_scripts/ofcourse - Alias /~ofcourse /afs/athena.mit.edu/org/o/ofcourse/web_scripts - SuExecUserGroup ofcourse ofcourse + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/ofcourse.pem @@ -24,7 +11,5 @@ ServerName ofcourse.mit.edu ServerAlias ofcourse - DocumentRoot /afs/athena.mit.edu/org/o/ofcourse/web_scripts/ofcourse - Alias /~ofcourse /afs/athena.mit.edu/org/o/ofcourse/web_scripts - SuExecUserGroup ofcourse ofcourse + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/olivetti.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/olivetti.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/olivetti.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName olivetti.mit.edu - ServerAlias olivetti - DocumentRoot /afs/athena.mit.edu/org/o/olivettigroup/web_scripts/home - Alias /~olivettigroup /afs/athena.mit.edu/org/o/olivettigroup/web_scripts - SuExecUserGroup olivettigroup olivettigroup - Include conf.d/vhosts-common.conf - - ServerName olivetti.mit.edu ServerAlias olivetti - DocumentRoot /afs/athena.mit.edu/org/o/olivettigroup/web_scripts/home - Alias /~olivettigroup /afs/athena.mit.edu/org/o/olivettigroup/web_scripts - SuExecUserGroup olivettigroup olivettigroup + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/olivetti.pem @@ -24,7 +11,5 @@ ServerName olivetti.mit.edu ServerAlias olivetti - DocumentRoot /afs/athena.mit.edu/org/o/olivettigroup/web_scripts/home - Alias /~olivettigroup /afs/athena.mit.edu/org/o/olivettigroup/web_scripts - SuExecUserGroup olivettigroup olivettigroup + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/picker.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/picker.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/picker.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName picker.mit.edu - ServerAlias picker - DocumentRoot /afs/athena.mit.edu/course/urop/picker/web_scripts - Alias /~picker /afs/athena.mit.edu/course/urop/picker/web_scripts - SuExecUserGroup picker picker - Include conf.d/vhosts-common.conf - - ServerName picker.mit.edu ServerAlias picker - DocumentRoot /afs/athena.mit.edu/course/urop/picker/web_scripts - Alias /~picker /afs/athena.mit.edu/course/urop/picker/web_scripts - SuExecUserGroup picker picker + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/picker.pem @@ -24,7 +11,5 @@ ServerName picker.mit.edu ServerAlias picker - DocumentRoot /afs/athena.mit.edu/course/urop/picker/web_scripts - Alias /~picker /afs/athena.mit.edu/course/urop/picker/web_scripts - SuExecUserGroup picker picker + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/pickr.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/pickr.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/pickr.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName pickr.mit.edu - ServerAlias pickr - DocumentRoot /afs/athena.mit.edu/course/urop/picker/web_scripts - Alias /~picker /afs/athena.mit.edu/course/urop/picker/web_scripts - SuExecUserGroup picker picker - Include conf.d/vhosts-common.conf - - ServerName pickr.mit.edu ServerAlias pickr - DocumentRoot /afs/athena.mit.edu/course/urop/picker/web_scripts - Alias /~picker /afs/athena.mit.edu/course/urop/picker/web_scripts - SuExecUserGroup picker picker + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/pickr.pem @@ -24,7 +11,5 @@ ServerName pickr.mit.edu ServerAlias pickr - DocumentRoot /afs/athena.mit.edu/course/urop/picker/web_scripts - Alias /~picker /afs/athena.mit.edu/course/urop/picker/web_scripts - SuExecUserGroup picker picker + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/psetcentral.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/psetcentral.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/psetcentral.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName psetcentral.mit.edu - ServerAlias psetcentral - DocumentRoot /afs/athena.mit.edu/course/21/21w785/web_scripts/psetcentral - Alias /~21w785 /afs/athena.mit.edu/course/21/21w785/web_scripts - SuExecUserGroup 21w785 21w785 - Include conf.d/vhosts-common.conf - - ServerName psetcentral.mit.edu ServerAlias psetcentral - DocumentRoot /afs/athena.mit.edu/course/21/21w785/web_scripts/psetcentral - Alias /~21w785 /afs/athena.mit.edu/course/21/21w785/web_scripts - SuExecUserGroup 21w785 21w785 + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/psetcentral.pem @@ -24,7 +11,5 @@ ServerName psetcentral.mit.edu ServerAlias psetcentral - DocumentRoot /afs/athena.mit.edu/course/21/21w785/web_scripts/psetcentral - Alias /~21w785 /afs/athena.mit.edu/course/21/21w785/web_scripts - SuExecUserGroup 21w785 21w785 + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/quota.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/quota.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/quota.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName quota.mit.edu - ServerAlias quota - DocumentRoot /afs/athena.mit.edu/user/b/t/btidor/web_scripts/quota.py - Alias /~btidor /afs/athena.mit.edu/user/b/t/btidor/web_scripts - SuExecUserGroup btidor btidor - Include conf.d/vhosts-common.conf - - ServerName quota.mit.edu ServerAlias quota - DocumentRoot /afs/athena.mit.edu/user/b/t/btidor/web_scripts/quota.py - Alias /~btidor /afs/athena.mit.edu/user/b/t/btidor/web_scripts - SuExecUserGroup btidor btidor + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/quota.pem @@ -24,7 +11,5 @@ ServerName quota.mit.edu ServerAlias quota - DocumentRoot /afs/athena.mit.edu/user/b/t/btidor/web_scripts/quota.py - Alias /~btidor /afs/athena.mit.edu/user/b/t/btidor/web_scripts - SuExecUserGroup btidor btidor + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/random-hall.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/random-hall.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/random-hall.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName random-hall.mit.edu - ServerAlias random-hall - DocumentRoot /afs/athena.mit.edu/activity/r/random-hall/web_scripts - Alias /~random-hall /afs/athena.mit.edu/activity/r/random-hall/web_scripts - SuExecUserGroup random-hall random-hall - Include conf.d/vhosts-common.conf - - ServerName random-hall.mit.edu ServerAlias random-hall - DocumentRoot /afs/athena.mit.edu/activity/r/random-hall/web_scripts - Alias /~random-hall /afs/athena.mit.edu/activity/r/random-hall/web_scripts - SuExecUserGroup random-hall random-hall + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/random-hall.pem @@ -24,7 +11,5 @@ ServerName random-hall.mit.edu ServerAlias random-hall - DocumentRoot /afs/athena.mit.edu/activity/r/random-hall/web_scripts - Alias /~random-hall /afs/athena.mit.edu/activity/r/random-hall/web_scripts - SuExecUserGroup random-hall random-hall + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/rcmodel.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/rcmodel.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/rcmodel.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName rcmodel.mit.edu - ServerAlias rcmodel - DocumentRoot /afs/athena.mit.edu/course/12/12.340x/web_scripts - Alias /~12.340x /afs/athena.mit.edu/course/12/12.340x/web_scripts - SuExecUserGroup 12.340x 12.340x - Include conf.d/vhosts-common.conf - - ServerName rcmodel.mit.edu ServerAlias rcmodel - DocumentRoot /afs/athena.mit.edu/course/12/12.340x/web_scripts - Alias /~12.340x /afs/athena.mit.edu/course/12/12.340x/web_scripts - SuExecUserGroup 12.340x 12.340x + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/rcmodel.pem @@ -24,7 +11,5 @@ ServerName rcmodel.mit.edu ServerAlias rcmodel - DocumentRoot /afs/athena.mit.edu/course/12/12.340x/web_scripts - Alias /~12.340x /afs/athena.mit.edu/course/12/12.340x/web_scripts - SuExecUserGroup 12.340x 12.340x + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/reify-vhost.py =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/reify-vhost.py (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/reify-vhost.py (revision 2731) @@ -32,26 +32,13 @@ [host, host])) if len(r) != 0: - user = pwd.getpwuid(int(r[0][1]['apacheSuexecUid'][0])) serveralias = "" if 'apacheServerAlias' in r[0][1]: serveralias = "ServerAlias "+" ".join(r[0][1]['apacheServerAlias']) - print """# do not trailing-slash DocumentRoot - - - ServerName %(servername)s - %(serveralias)s - DocumentRoot %(docroot)s - Alias /~%(uname)s %(homedir)s/web_scripts - SuExecUserGroup %(uname)s %(uname)s - Include conf.d/vhosts-common.conf - - + print """\ ServerName %(servername)s %(serveralias)s - DocumentRoot %(docroot)s - Alias /~%(uname)s %(homedir)s/web_scripts - SuExecUserGroup %(uname)s %(uname)s + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/%(hname)s.pem @@ -61,7 +48,5 @@ ServerName %(servername)s %(serveralias)s - DocumentRoot %(docroot)s - Alias /~%(uname)s %(homedir)s/web_scripts - SuExecUserGroup %(uname)s %(uname)s + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf @@ -72,7 +57,4 @@ 'servername': r[0][1]['apacheServerName'][0], 'serveralias': serveralias, - 'docroot': r[0][1]['apacheDocumentRoot'][0], - 'uname': user[0], - 'homedir': user[5], 'hname': host } Index: trunk/server/fedora/config/etc/httpd/vhosts.d/roost-test.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/roost-test.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/roost-test.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName roost-test.mit.edu - ServerAlias roost-test - DocumentRoot /afs/sipb.mit.edu/project/roost/web_scripts/test - Alias /~roost /afs/sipb.mit.edu/project/roost/web_scripts - SuExecUserGroup roost roost - Include conf.d/vhosts-common.conf - - ServerName roost-test.mit.edu ServerAlias roost-test - DocumentRoot /afs/sipb.mit.edu/project/roost/web_scripts/test - Alias /~roost /afs/sipb.mit.edu/project/roost/web_scripts - SuExecUserGroup roost roost + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/roost-test.pem @@ -24,7 +11,5 @@ ServerName roost-test.mit.edu ServerAlias roost-test - DocumentRoot /afs/sipb.mit.edu/project/roost/web_scripts/test - Alias /~roost /afs/sipb.mit.edu/project/roost/web_scripts - SuExecUserGroup roost roost + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/roost.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/roost.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/roost.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName roost.mit.edu - ServerAlias roost - DocumentRoot /afs/sipb.mit.edu/project/roost/web_scripts/prod - Alias /~roost /afs/sipb.mit.edu/project/roost/web_scripts - SuExecUserGroup roost roost - Include conf.d/vhosts-common.conf - - ServerName roost.mit.edu ServerAlias roost - DocumentRoot /afs/sipb.mit.edu/project/roost/web_scripts/prod - Alias /~roost /afs/sipb.mit.edu/project/roost/web_scripts - SuExecUserGroup roost roost + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/roost.pem @@ -24,7 +11,5 @@ ServerName roost.mit.edu ServerAlias roost - DocumentRoot /afs/sipb.mit.edu/project/roost/web_scripts/prod - Alias /~roost /afs/sipb.mit.edu/project/roost/web_scripts - SuExecUserGroup roost roost + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/rpl.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/rpl.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/rpl.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName rpl.mit.edu - ServerAlias rpl - DocumentRoot /afs/athena.mit.edu/org/r/rpl/web_scripts - Alias /~rpl /afs/athena.mit.edu/org/r/rpl/web_scripts - SuExecUserGroup rpl rpl - Include conf.d/vhosts-common.conf - - ServerName rpl.mit.edu ServerAlias rpl - DocumentRoot /afs/athena.mit.edu/org/r/rpl/web_scripts - Alias /~rpl /afs/athena.mit.edu/org/r/rpl/web_scripts - SuExecUserGroup rpl rpl + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/rpl.pem @@ -24,7 +11,5 @@ ServerName rpl.mit.edu ServerAlias rpl - DocumentRoot /afs/athena.mit.edu/org/r/rpl/web_scripts - Alias /~rpl /afs/athena.mit.edu/org/r/rpl/web_scripts - SuExecUserGroup rpl rpl + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/sayno.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/sayno.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/sayno.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName sayno.mit.edu - ServerAlias sayno - DocumentRoot /afs/sipb.mit.edu/contrib/cfs/web_scripts/sayno - Alias /~cfs /afs/sipb.mit.edu/contrib/cfs/web_scripts - SuExecUserGroup cfs cfs - Include conf.d/vhosts-common.conf - - ServerName sayno.mit.edu ServerAlias sayno - DocumentRoot /afs/sipb.mit.edu/contrib/cfs/web_scripts/sayno - Alias /~cfs /afs/sipb.mit.edu/contrib/cfs/web_scripts - SuExecUserGroup cfs cfs + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/sayno.pem @@ -24,7 +11,5 @@ ServerName sayno.mit.edu ServerAlias sayno - DocumentRoot /afs/sipb.mit.edu/contrib/cfs/web_scripts/sayno - Alias /~cfs /afs/sipb.mit.edu/contrib/cfs/web_scripts - SuExecUserGroup cfs cfs + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/schuh.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/schuh.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/schuh.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName schuh.mit.edu - ServerAlias schuh - DocumentRoot /afs/athena.mit.edu/org/s/schuhgroup/web_scripts - Alias /~schuhgroup /afs/athena.mit.edu/org/s/schuhgroup/web_scripts - SuExecUserGroup schuhgroup schuhgroup - Include conf.d/vhosts-common.conf - - ServerName schuh.mit.edu ServerAlias schuh - DocumentRoot /afs/athena.mit.edu/org/s/schuhgroup/web_scripts - Alias /~schuhgroup /afs/athena.mit.edu/org/s/schuhgroup/web_scripts - SuExecUserGroup schuhgroup schuhgroup + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/schuh.pem @@ -24,7 +11,5 @@ ServerName schuh.mit.edu ServerAlias schuh - DocumentRoot /afs/athena.mit.edu/org/s/schuhgroup/web_scripts - Alias /~schuhgroup /afs/athena.mit.edu/org/s/schuhgroup/web_scripts - SuExecUserGroup schuhgroup schuhgroup + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/set-up.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/set-up.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/set-up.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName set-up.mit.edu - ServerAlias set-up - DocumentRoot /afs/athena.mit.edu/user/k/a/karsons/web_scripts/set-up - Alias /~karsons /afs/athena.mit.edu/user/k/a/karsons/web_scripts - SuExecUserGroup karsons karsons - Include conf.d/vhosts-common.conf - - ServerName set-up.mit.edu ServerAlias set-up - DocumentRoot /afs/athena.mit.edu/user/k/a/karsons/web_scripts/set-up - Alias /~karsons /afs/athena.mit.edu/user/k/a/karsons/web_scripts - SuExecUserGroup karsons karsons + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/set-up.pem @@ -24,7 +11,5 @@ ServerName set-up.mit.edu ServerAlias set-up - DocumentRoot /afs/athena.mit.edu/user/k/a/karsons/web_scripts/set-up - Alias /~karsons /afs/athena.mit.edu/user/k/a/karsons/web_scripts - SuExecUserGroup karsons karsons + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/signup.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/signup.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/signup.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName signup.mit.edu - ServerAlias signup - DocumentRoot /afs/athena.mit.edu/user/d/h/dheera/web_scripts/signup - Alias /~dheera /afs/athena.mit.edu/user/d/h/dheera/web_scripts - SuExecUserGroup dheera dheera - Include conf.d/vhosts-common.conf - - ServerName signup.mit.edu ServerAlias signup - DocumentRoot /afs/athena.mit.edu/user/d/h/dheera/web_scripts/signup - Alias /~dheera /afs/athena.mit.edu/user/d/h/dheera/web_scripts - SuExecUserGroup dheera dheera + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/signup.pem @@ -24,7 +11,5 @@ ServerName signup.mit.edu ServerAlias signup - DocumentRoot /afs/athena.mit.edu/user/d/h/dheera/web_scripts/signup - Alias /~dheera /afs/athena.mit.edu/user/d/h/dheera/web_scripts - SuExecUserGroup dheera dheera + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/sipb.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/sipb.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/sipb.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName sipb.mit.edu - ServerAlias sipb sipb.org www.sipb.org - DocumentRoot /afs/sipb.mit.edu/project/sipb-www/web_scripts/sipb - Alias /~sipb-www /afs/sipb.mit.edu/project/sipb-www/web_scripts - SuExecUserGroup sipb-www sipb-www - Include conf.d/vhosts-common.conf - - ServerName sipb.mit.edu ServerAlias sipb sipb.org www.sipb.org - DocumentRoot /afs/sipb.mit.edu/project/sipb-www/web_scripts/sipb - Alias /~sipb-www /afs/sipb.mit.edu/project/sipb-www/web_scripts - SuExecUserGroup sipb-www sipb-www + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/sipb.pem @@ -24,7 +11,5 @@ ServerName sipb.mit.edu ServerAlias sipb sipb.org www.sipb.org - DocumentRoot /afs/sipb.mit.edu/project/sipb-www/web_scripts/sipb - Alias /~sipb-www /afs/sipb.mit.edu/project/sipb-www/web_scripts - SuExecUserGroup sipb-www sipb-www + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/six101.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/six101.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/six101.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName six101.mit.edu - ServerAlias six101 - DocumentRoot /afs/athena.mit.edu/course/6/6.101/web_scripts - Alias /~6.101 /afs/athena.mit.edu/course/6/6.101/web_scripts - SuExecUserGroup 6.101 6.101 - Include conf.d/vhosts-common.conf - - ServerName six101.mit.edu ServerAlias six101 - DocumentRoot /afs/athena.mit.edu/course/6/6.101/web_scripts - Alias /~6.101 /afs/athena.mit.edu/course/6/6.101/web_scripts - SuExecUserGroup 6.101 6.101 + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/six101.pem @@ -24,7 +11,5 @@ ServerName six101.mit.edu ServerAlias six101 - DocumentRoot /afs/athena.mit.edu/course/6/6.101/web_scripts - Alias /~6.101 /afs/athena.mit.edu/course/6/6.101/web_scripts - SuExecUserGroup 6.101 6.101 + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/sixohtwo.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/sixohtwo.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/sixohtwo.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName sixohtwo.mit.edu - ServerAlias sixohtwo - DocumentRoot /afs/athena.mit.edu/course/6/6.02/web_scripts - Alias /~6.02 /afs/athena.mit.edu/course/6/6.02/web_scripts - SuExecUserGroup 6.02 6.02 - Include conf.d/vhosts-common.conf - - ServerName sixohtwo.mit.edu ServerAlias sixohtwo - DocumentRoot /afs/athena.mit.edu/course/6/6.02/web_scripts - Alias /~6.02 /afs/athena.mit.edu/course/6/6.02/web_scripts - SuExecUserGroup 6.02 6.02 + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/sixohtwo.pem @@ -24,7 +11,5 @@ ServerName sixohtwo.mit.edu ServerAlias sixohtwo - DocumentRoot /afs/athena.mit.edu/course/6/6.02/web_scripts - Alias /~6.02 /afs/athena.mit.edu/course/6/6.02/web_scripts - SuExecUserGroup 6.02 6.02 + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/sl2.xyz.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/sl2.xyz.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/sl2.xyz.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName sl2.xyz - - DocumentRoot /afs/athena.mit.edu/user/s/l/slz/web_scripts/sl2.xyz - Alias /~slz /afs/athena.mit.edu/user/s/l/slz/web_scripts - SuExecUserGroup slz slz - Include conf.d/vhosts-common.conf - - ServerName sl2.xyz - DocumentRoot /afs/athena.mit.edu/user/s/l/slz/web_scripts/sl2.xyz - Alias /~slz /afs/athena.mit.edu/user/s/l/slz/web_scripts - SuExecUserGroup slz slz + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/sl2.xyz.pem @@ -24,7 +11,5 @@ ServerName sl2.xyz - DocumentRoot /afs/athena.mit.edu/user/s/l/slz/web_scripts/sl2.xyz - Alias /~slz /afs/athena.mit.edu/user/s/l/slz/web_scripts - SuExecUserGroup slz slz + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/swe.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/swe.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/swe.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName swe.mit.edu - ServerAlias swe - DocumentRoot /afs/athena.mit.edu/activity/s/swe/web_scripts - Alias /~swe /afs/athena.mit.edu/activity/s/swe/web_scripts - SuExecUserGroup swe swe - Include conf.d/vhosts-common.conf - - ServerName swe.mit.edu ServerAlias swe - DocumentRoot /afs/athena.mit.edu/activity/s/swe/web_scripts - Alias /~swe /afs/athena.mit.edu/activity/s/swe/web_scripts - SuExecUserGroup swe swe + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/swe.pem @@ -24,7 +11,5 @@ ServerName swe.mit.edu ServerAlias swe - DocumentRoot /afs/athena.mit.edu/activity/s/swe/web_scripts - Alias /~swe /afs/athena.mit.edu/activity/s/swe/web_scripts - SuExecUserGroup swe swe + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/tb.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/tb.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/tb.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName tb.mit.edu - ServerAlias tb - DocumentRoot /afs/athena.mit.edu/user/y/a/yasyf/web_scripts/textbooks - Alias /~yasyf /afs/athena.mit.edu/user/y/a/yasyf/web_scripts - SuExecUserGroup yasyf yasyf - Include conf.d/vhosts-common.conf - - ServerName tb.mit.edu ServerAlias tb - DocumentRoot /afs/athena.mit.edu/user/y/a/yasyf/web_scripts/textbooks - Alias /~yasyf /afs/athena.mit.edu/user/y/a/yasyf/web_scripts - SuExecUserGroup yasyf yasyf + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/tb.pem @@ -24,7 +11,5 @@ ServerName tb.mit.edu ServerAlias tb - DocumentRoot /afs/athena.mit.edu/user/y/a/yasyf/web_scripts/textbooks - Alias /~yasyf /afs/athena.mit.edu/user/y/a/yasyf/web_scripts - SuExecUserGroup yasyf yasyf + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/techfair.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/techfair.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/techfair.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName techfair.mit.edu - ServerAlias techfair - DocumentRoot /afs/athena.mit.edu/activity/t/techx/web_scripts - Alias /~techx /afs/athena.mit.edu/activity/t/techx/web_scripts - SuExecUserGroup techx techx - Include conf.d/vhosts-common.conf - - ServerName techfair.mit.edu ServerAlias techfair - DocumentRoot /afs/athena.mit.edu/activity/t/techx/web_scripts - Alias /~techx /afs/athena.mit.edu/activity/t/techx/web_scripts - SuExecUserGroup techx techx + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/techfair.pem @@ -24,7 +11,5 @@ ServerName techfair.mit.edu ServerAlias techfair - DocumentRoot /afs/athena.mit.edu/activity/t/techx/web_scripts - Alias /~techx /afs/athena.mit.edu/activity/t/techx/web_scripts - SuExecUserGroup techx techx + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/tf.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/tf.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/tf.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName tf.mit.edu - ServerAlias tf - DocumentRoot /afs/athena.mit.edu/activity/t/techx/web_scripts - Alias /~techx /afs/athena.mit.edu/activity/t/techx/web_scripts - SuExecUserGroup techx techx - Include conf.d/vhosts-common.conf - - ServerName tf.mit.edu ServerAlias tf - DocumentRoot /afs/athena.mit.edu/activity/t/techx/web_scripts - Alias /~techx /afs/athena.mit.edu/activity/t/techx/web_scripts - SuExecUserGroup techx techx + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/tf.pem @@ -24,7 +11,5 @@ ServerName tf.mit.edu ServerAlias tf - DocumentRoot /afs/athena.mit.edu/activity/t/techx/web_scripts - Alias /~techx /afs/athena.mit.edu/activity/t/techx/web_scripts - SuExecUserGroup techx techx + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/tibetforum.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/tibetforum.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/tibetforum.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName tibetforum.mit.edu - ServerAlias tibetforum - DocumentRoot /afs/athena.mit.edu/activity/c/cssa/web_scripts/phpbb - Alias /~cssa /afs/athena.mit.edu/activity/c/cssa/web_scripts - SuExecUserGroup cssa cssa - Include conf.d/vhosts-common.conf - - ServerName tibetforum.mit.edu ServerAlias tibetforum - DocumentRoot /afs/athena.mit.edu/activity/c/cssa/web_scripts/phpbb - Alias /~cssa /afs/athena.mit.edu/activity/c/cssa/web_scripts - SuExecUserGroup cssa cssa + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/tibetforum.pem @@ -24,7 +11,5 @@ ServerName tibetforum.mit.edu ServerAlias tibetforum - DocumentRoot /afs/athena.mit.edu/activity/c/cssa/web_scripts/phpbb - Alias /~cssa /afs/athena.mit.edu/activity/c/cssa/web_scripts - SuExecUserGroup cssa cssa + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/ties.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/ties.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/ties.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName ties.mit.edu - ServerAlias ties - DocumentRoot /afs/athena.mit.edu/user/n/a/nagaraj/web_scripts/ties - Alias /~nagaraj /afs/athena.mit.edu/user/n/a/nagaraj/web_scripts - SuExecUserGroup nagaraj nagaraj - Include conf.d/vhosts-common.conf - - ServerName ties.mit.edu ServerAlias ties - DocumentRoot /afs/athena.mit.edu/user/n/a/nagaraj/web_scripts/ties - Alias /~nagaraj /afs/athena.mit.edu/user/n/a/nagaraj/web_scripts - SuExecUserGroup nagaraj nagaraj + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/ties.pem @@ -24,7 +11,5 @@ ServerName ties.mit.edu ServerAlias ties - DocumentRoot /afs/athena.mit.edu/user/n/a/nagaraj/web_scripts/ties - Alias /~nagaraj /afs/athena.mit.edu/user/n/a/nagaraj/web_scripts - SuExecUserGroup nagaraj nagaraj + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/tours.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/tours.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/tours.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName tours.mit.edu - ServerAlias tours - DocumentRoot /afs/athena.mit.edu/org/t/tours/web_scripts - Alias /~tours /afs/athena.mit.edu/org/t/tours/web_scripts - SuExecUserGroup tours tours - Include conf.d/vhosts-common.conf - - ServerName tours.mit.edu ServerAlias tours - DocumentRoot /afs/athena.mit.edu/org/t/tours/web_scripts - Alias /~tours /afs/athena.mit.edu/org/t/tours/web_scripts - SuExecUserGroup tours tours + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/tours.pem @@ -24,7 +11,5 @@ ServerName tours.mit.edu ServerAlias tours - DocumentRoot /afs/athena.mit.edu/org/t/tours/web_scripts - Alias /~tours /afs/athena.mit.edu/org/t/tours/web_scripts - SuExecUserGroup tours tours + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/twentytwelve.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/twentytwelve.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/twentytwelve.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName twentytwelve.mit.edu - ServerAlias twentytwelve - DocumentRoot /afs/athena.mit.edu/activity/other/2012/web_scripts - Alias /~2012 /afs/athena.mit.edu/activity/other/2012/web_scripts - SuExecUserGroup 2012 2012 - Include conf.d/vhosts-common.conf - - ServerName twentytwelve.mit.edu ServerAlias twentytwelve - DocumentRoot /afs/athena.mit.edu/activity/other/2012/web_scripts - Alias /~2012 /afs/athena.mit.edu/activity/other/2012/web_scripts - SuExecUserGroup 2012 2012 + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/twentytwelve.pem @@ -24,7 +11,5 @@ ServerName twentytwelve.mit.edu ServerAlias twentytwelve - DocumentRoot /afs/athena.mit.edu/activity/other/2012/web_scripts - Alias /~2012 /afs/athena.mit.edu/activity/other/2012/web_scripts - SuExecUserGroup 2012 2012 + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/unim.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/unim.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/unim.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName unim.mit.edu - ServerAlias unim - DocumentRoot /afs/athena.mit.edu/user/a/a/aandre/web_scripts/unim - Alias /~aandre /afs/athena.mit.edu/user/a/a/aandre/web_scripts - SuExecUserGroup aandre aandre - Include conf.d/vhosts-common.conf - - ServerName unim.mit.edu ServerAlias unim - DocumentRoot /afs/athena.mit.edu/user/a/a/aandre/web_scripts/unim - Alias /~aandre /afs/athena.mit.edu/user/a/a/aandre/web_scripts - SuExecUserGroup aandre aandre + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/unim.pem @@ -24,7 +11,5 @@ ServerName unim.mit.edu ServerAlias unim - DocumentRoot /afs/athena.mit.edu/user/a/a/aandre/web_scripts/unim - Alias /~aandre /afs/athena.mit.edu/user/a/a/aandre/web_scripts - SuExecUserGroup aandre aandre + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/vasilvv.org.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/vasilvv.org.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/vasilvv.org.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName vasilvv.org - - DocumentRoot /afs/athena.mit.edu/user/v/a/vasilvv/web_scripts/personal - Alias /~vasilvv /afs/athena.mit.edu/user/v/a/vasilvv/web_scripts - SuExecUserGroup vasilvv vasilvv - Include conf.d/vhosts-common.conf - - ServerName vasilvv.org - DocumentRoot /afs/athena.mit.edu/user/v/a/vasilvv/web_scripts/personal - Alias /~vasilvv /afs/athena.mit.edu/user/v/a/vasilvv/web_scripts - SuExecUserGroup vasilvv vasilvv + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/vasilvv.org.pem @@ -24,7 +11,5 @@ ServerName vasilvv.org - DocumentRoot /afs/athena.mit.edu/user/v/a/vasilvv/web_scripts/personal - Alias /~vasilvv /afs/athena.mit.edu/user/v/a/vasilvv/web_scripts - SuExecUserGroup vasilvv vasilvv + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/wakeup.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/wakeup.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/wakeup.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName wakeup.mit.edu - ServerAlias wakeup - DocumentRoot /afs/sipb.mit.edu/project/voip/web_scripts/wakeup - Alias /~sipb-voip /afs/sipb.mit.edu/project/voip/web_scripts - SuExecUserGroup sipb-voip sipb-voip - Include conf.d/vhosts-common.conf - - ServerName wakeup.mit.edu ServerAlias wakeup - DocumentRoot /afs/sipb.mit.edu/project/voip/web_scripts/wakeup - Alias /~sipb-voip /afs/sipb.mit.edu/project/voip/web_scripts - SuExecUserGroup sipb-voip sipb-voip + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/wakeup.pem @@ -24,7 +11,5 @@ ServerName wakeup.mit.edu ServerAlias wakeup - DocumentRoot /afs/sipb.mit.edu/project/voip/web_scripts/wakeup - Alias /~sipb-voip /afs/sipb.mit.edu/project/voip/web_scripts - SuExecUserGroup sipb-voip sipb-voip + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/webathena.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/webathena.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/webathena.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName webathena.mit.edu - ServerAlias webathena - DocumentRoot /afs/sipb.mit.edu/project/webathena/web_scripts - Alias /~webathena /afs/sipb.mit.edu/project/webathena/web_scripts - SuExecUserGroup webathena webathena - Include conf.d/vhosts-common.conf - - ServerName webathena.mit.edu ServerAlias webathena - DocumentRoot /afs/sipb.mit.edu/project/webathena/web_scripts - Alias /~webathena /afs/sipb.mit.edu/project/webathena/web_scripts - SuExecUserGroup webathena webathena + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/webathena.pem @@ -24,7 +11,5 @@ ServerName webathena.mit.edu ServerAlias webathena - DocumentRoot /afs/sipb.mit.edu/project/webathena/web_scripts - Alias /~webathena /afs/sipb.mit.edu/project/webathena/web_scripts - SuExecUserGroup webathena webathena + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/webid.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/webid.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/webid.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName webid.mit.edu - ServerAlias webid - DocumentRoot /afs/athena.mit.edu/user/p/r/presbrey/web_scripts/sites/webid.mit.edu - Alias /~presbrey /afs/athena.mit.edu/user/p/r/presbrey/web_scripts - SuExecUserGroup presbrey presbrey - Include conf.d/vhosts-common.conf - - ServerName webid.mit.edu ServerAlias webid - DocumentRoot /afs/athena.mit.edu/user/p/r/presbrey/web_scripts/sites/webid.mit.edu - Alias /~presbrey /afs/athena.mit.edu/user/p/r/presbrey/web_scripts - SuExecUserGroup presbrey presbrey + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/webid.pem @@ -24,7 +11,5 @@ ServerName webid.mit.edu ServerAlias webid - DocumentRoot /afs/athena.mit.edu/user/p/r/presbrey/web_scripts/sites/webid.mit.edu - Alias /~presbrey /afs/athena.mit.edu/user/p/r/presbrey/web_scripts - SuExecUserGroup presbrey presbrey + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/westgate.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/westgate.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/westgate.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName westgate.mit.edu - ServerAlias westgate - DocumentRoot /afs/athena.mit.edu/activity/w/westgate/web_scripts - Alias /~westgate /afs/athena.mit.edu/activity/w/westgate/web_scripts - SuExecUserGroup westgate westgate - Include conf.d/vhosts-common.conf - - ServerName westgate.mit.edu ServerAlias westgate - DocumentRoot /afs/athena.mit.edu/activity/w/westgate/web_scripts - Alias /~westgate /afs/athena.mit.edu/activity/w/westgate/web_scripts - SuExecUserGroup westgate westgate + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/westgate.pem @@ -24,7 +11,5 @@ ServerName westgate.mit.edu ServerAlias westgate - DocumentRoot /afs/athena.mit.edu/activity/w/westgate/web_scripts - Alias /~westgate /afs/athena.mit.edu/activity/w/westgate/web_scripts - SuExecUserGroup westgate westgate + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/whatsnext.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/whatsnext.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/whatsnext.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName whatsnext.mit.edu - ServerAlias whatsnext - DocumentRoot /afs/sipb.mit.edu/contrib/cfs/web_scripts - Alias /~cfs /afs/sipb.mit.edu/contrib/cfs/web_scripts - SuExecUserGroup cfs cfs - Include conf.d/vhosts-common.conf - - ServerName whatsnext.mit.edu ServerAlias whatsnext - DocumentRoot /afs/sipb.mit.edu/contrib/cfs/web_scripts - Alias /~cfs /afs/sipb.mit.edu/contrib/cfs/web_scripts - SuExecUserGroup cfs cfs + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/whatsnext.pem @@ -24,7 +11,5 @@ ServerName whatsnext.mit.edu ServerAlias whatsnext - DocumentRoot /afs/sipb.mit.edu/contrib/cfs/web_scripts - Alias /~cfs /afs/sipb.mit.edu/contrib/cfs/web_scripts - SuExecUserGroup cfs cfs + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/www.achernya.com.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/www.achernya.com.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/www.achernya.com.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName www.achernya.com - - DocumentRoot /afs/athena.mit.edu/user/a/c/achernya/web_scripts/achernya - Alias /~achernya /afs/athena.mit.edu/user/a/c/achernya/web_scripts - SuExecUserGroup achernya achernya - Include conf.d/vhosts-common.conf - - ServerName www.achernya.com - DocumentRoot /afs/athena.mit.edu/user/a/c/achernya/web_scripts/achernya - Alias /~achernya /afs/athena.mit.edu/user/a/c/achernya/web_scripts - SuExecUserGroup achernya achernya + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/www.achernya.com.pem @@ -24,7 +11,5 @@ ServerName www.achernya.com - DocumentRoot /afs/athena.mit.edu/user/a/c/achernya/web_scripts/achernya - Alias /~achernya /afs/athena.mit.edu/user/a/c/achernya/web_scripts - SuExecUserGroup achernya achernya + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/www.davidben.net.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/www.davidben.net.conf (revision 2730) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/www.davidben.net.conf (revision 2731) @@ -1,20 +1,7 @@ -# do not trailing-slash DocumentRoot - - - ServerName www.davidben.net - - DocumentRoot /afs/athena.mit.edu/user/d/a/davidben/web_scripts - Alias /~davidben /afs/athena.mit.edu/user/d/a/davidben/web_scripts - SuExecUserGroup davidben davidben - Include conf.d/vhosts-common.conf - - ServerName www.davidben.net - DocumentRoot /afs/athena.mit.edu/user/d/a/davidben/web_scripts - Alias /~davidben /afs/athena.mit.edu/user/d/a/davidben/web_scripts - SuExecUserGroup davidben davidben + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/www.davidben.net.pem @@ -24,7 +11,5 @@ ServerName www.davidben.net - DocumentRoot /afs/athena.mit.edu/user/d/a/davidben/web_scripts - Alias /~davidben /afs/athena.mit.edu/user/d/a/davidben/web_scripts - SuExecUserGroup davidben davidben + Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf Include conf.d/vhosts-common-ssl-cert.conf