- Timestamp:
- May 22, 2012, 10:52:35 PM (12 years ago)
- Location:
- branches/fc17-dev
- Files:
-
- 4 deleted
- 4 edited
- 7 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/fc17-dev
- Property svn:mergeinfo changed
/trunk (added) merged: 2082-2122,2125-2148,2150-2194
- Property svn:mergeinfo changed
-
branches/fc17-dev/server/fedora/config/etc/httpd/vhosts.d/asa.conf
r1802 r2195 4 4 ServerName asa.mit.edu 5 5 ServerAlias asa 6 DocumentRoot /afs/athena.mit.edu/activity/a/asa /web_scripts7 Alias /~asa /afs/athena.mit.edu/activity/a/asa/web_scripts8 SuExecUserGroup asa asa6 DocumentRoot /afs/athena.mit.edu/activity/a/asa-db/web_scripts/db 7 Alias /~asa-db /afs/athena.mit.edu/activity/a/asa-db/web_scripts 8 SuExecUserGroup asa-db asa-db 9 9 Include conf.d/vhosts-common.conf 10 10 </VirtualHost> … … 14 14 ServerName asa.mit.edu 15 15 ServerAlias asa 16 DocumentRoot /afs/athena.mit.edu/activity/a/asa /web_scripts17 Alias /~asa /afs/athena.mit.edu/activity/a/asa/web_scripts18 SuExecUserGroup asa asa16 DocumentRoot /afs/athena.mit.edu/activity/a/asa-db/web_scripts/db 17 Alias /~asa-db /afs/athena.mit.edu/activity/a/asa-db/web_scripts 18 SuExecUserGroup asa-db asa-db 19 19 Include conf.d/vhosts-common-ssl.conf 20 20 SSLCertificateFile /etc/pki/tls/certs/asa.pem … … 24 24 ServerName asa.mit.edu 25 25 ServerAlias asa 26 DocumentRoot /afs/athena.mit.edu/activity/a/asa /web_scripts27 Alias /~asa /afs/athena.mit.edu/activity/a/asa/web_scripts28 SuExecUserGroup asa asa26 DocumentRoot /afs/athena.mit.edu/activity/a/asa-db/web_scripts/db 27 Alias /~asa-db /afs/athena.mit.edu/activity/a/asa-db/web_scripts 28 SuExecUserGroup asa-db asa-db 29 29 Include conf.d/vhosts-common-ssl.conf 30 30 Include conf.d/vhosts-common-ssl-cert.conf -
branches/fc17-dev/server/fedora/config/etc/httpd/vhosts.d/debathena.conf
r1081 r2195 3 3 <VirtualHost *:80> 4 4 ServerName debathena.mit.edu 5 ServerAlias debathena5 ServerAlias *.debathena.com *.debathena.net *.debathena.org debathena debathena.com debathena.net debathena.org 6 6 DocumentRoot /afs/sipb.mit.edu/project/debathena/web_scripts 7 7 Alias /~debathena /afs/sipb.mit.edu/project/debathena/web_scripts … … 14 14 <VirtualHost *:443> 15 15 ServerName debathena.mit.edu 16 ServerAlias debathena16 ServerAlias *.debathena.com *.debathena.net *.debathena.org debathena debathena.com debathena.net debathena.org 17 17 DocumentRoot /afs/sipb.mit.edu/project/debathena/web_scripts 18 18 Alias /~debathena /afs/sipb.mit.edu/project/debathena/web_scripts 19 19 SuExecUserGroup debathena debathena 20 20 Include conf.d/vhosts-common-ssl.conf 21 CustomLog /home/logview/debathena.log combined 21 22 SSLCertificateFile /etc/pki/tls/certs/debathena.pem 22 CustomLog /home/logview/debathena.log combined23 SSLCertificateKeyFile /etc/pki/tls/private/scripts.key 23 24 </VirtualHost> 24 25 <VirtualHost *:444> 25 26 ServerName debathena.mit.edu 26 ServerAlias debathena27 ServerAlias *.debathena.com *.debathena.net *.debathena.org debathena debathena.com debathena.net debathena.org 27 28 DocumentRoot /afs/sipb.mit.edu/project/debathena/web_scripts 28 29 Alias /~debathena /afs/sipb.mit.edu/project/debathena/web_scripts … … 30 31 Include conf.d/vhosts-common-ssl.conf 31 32 Include conf.d/vhosts-common-ssl-cert.conf 33 CustomLog /home/logview/debathena.log combined 32 34 SSLCertificateFile /etc/pki/tls/certs/debathena.pem 33 CustomLog /home/logview/debathena.log combined35 SSLCertificateKeyFile /etc/pki/tls/private/scripts.key 34 36 </VirtualHost> 35 37 </IfModule> -
branches/fc17-dev/server/fedora/config/etc/httpd/vhosts.d/impact.conf
r1405 r2195 19 19 Include conf.d/vhosts-common-ssl.conf 20 20 SSLCertificateFile /etc/pki/tls/certs/impact.pem 21 SSLCertificateKeyFile /etc/pki/tls/private/scripts.key 21 22 </VirtualHost> 22 23 <VirtualHost *:444> … … 29 30 Include conf.d/vhosts-common-ssl-cert.conf 30 31 SSLCertificateFile /etc/pki/tls/certs/impact.pem 32 SSLCertificateKeyFile /etc/pki/tls/private/scripts.key 31 33 </VirtualHost> 32 34 </IfModule>
Note: See TracChangeset
for help on using the changeset viewer.