Index: server/fedora/config/etc/httpd/conf.d/vhosts-common-ssl-cert.conf
===================================================================
--- server/fedora/config/etc/httpd/conf.d/vhosts-common-ssl-cert.conf (revision 263)
+++ server/fedora/config/etc/httpd/conf.d/vhosts-common-ssl-cert.conf (revision 270)
@@ -1,3 +1,4 @@
-# This file will be included inside VirtualHost blocks that use certificate auth.
+# This file will be included inside VirtualHost blocks that use
+# certificate auth.
SSLVerifyClient require
Index: server/fedora/config/etc/httpd/conf/httpd.conf
===================================================================
--- server/fedora/config/etc/httpd/conf/httpd.conf (revision 263)
+++ server/fedora/config/etc/httpd/conf/httpd.conf (revision 270)
@@ -254,6 +254,4 @@
-Alias /heartbeat /afs/athena.mit.edu/contrib/scripts/web_scripts/heartbeat
-
ServerName vhosts.mit.edu
@@ -277,4 +275,5 @@
SuExecUserGroup scripts users
UserDir web_scripts
+ Alias /heartbeat /afs/athena.mit.edu/contrib/scripts/web_scripts/heartbeat
Alias /src /afs/athena.mit.edu/contrib/scripts/src
Redirect /sql https://scripts.mit.edu/~sql
@@ -308,6 +307,5 @@
Include conf.d/vhosts-common-ssl.conf
SSLCertificateFile /etc/pki/tls/certs/scripts-cert-new.pem
- SSLVerifyClient require
- SSLVerifyDepth 1
+ Include conf.d/vhosts-common-ssl-cert.conf
@@ -319,6 +317,7 @@
ServerName scripts.mit.edu
- ServerAlias scripts scripts-test.mit.edu scripts-test
+ ServerAlias scripts scripts-test.mit.edu scripts-test 18.181.0.46 18.181.0.57 old-faithful.mit.edu old-faithful scripts3.mit.edu scripts3 18.181.0.53 better-mousetrap.mit.edu better-mousetrap scripts4.mit.edu scripts4
DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
+ Alias /heartbeat /afs/athena.mit.edu/contrib/scripts/web_scripts/heartbeat
SuExecUserGroup scripts users
UserDir web_scripts