Ignore:
Timestamp:
May 22, 2012, 10:52:35 PM (10 years ago)
Author:
ezyang
Message:
Merge changes from trunk.
Location:
branches/fc17-dev
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/fc17-dev

  • branches/fc17-dev/server/fedora/config/etc/httpd/vhosts.d/debathena.conf

    r1081 r2195  
    33<VirtualHost *:80>
    44        ServerName debathena.mit.edu
    5         ServerAlias debathena
     5        ServerAlias *.debathena.com *.debathena.net *.debathena.org debathena debathena.com debathena.net debathena.org
    66        DocumentRoot /afs/sipb.mit.edu/project/debathena/web_scripts
    77        Alias /~debathena /afs/sipb.mit.edu/project/debathena/web_scripts
     
    1414        <VirtualHost *:443>
    1515                ServerName debathena.mit.edu
    16                 ServerAlias debathena
     16                ServerAlias *.debathena.com *.debathena.net *.debathena.org debathena debathena.com debathena.net debathena.org
    1717                DocumentRoot /afs/sipb.mit.edu/project/debathena/web_scripts
    1818                Alias /~debathena /afs/sipb.mit.edu/project/debathena/web_scripts
    1919                SuExecUserGroup debathena debathena
    2020                Include conf.d/vhosts-common-ssl.conf
     21                CustomLog /home/logview/debathena.log combined
    2122                SSLCertificateFile /etc/pki/tls/certs/debathena.pem
    22                 CustomLog /home/logview/debathena.log combined
     23                SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    2324        </VirtualHost>
    2425        <VirtualHost *:444>
    2526                ServerName debathena.mit.edu
    26                 ServerAlias debathena
     27                ServerAlias *.debathena.com *.debathena.net *.debathena.org debathena debathena.com debathena.net debathena.org
    2728                DocumentRoot /afs/sipb.mit.edu/project/debathena/web_scripts
    2829                Alias /~debathena /afs/sipb.mit.edu/project/debathena/web_scripts
     
    3031                Include conf.d/vhosts-common-ssl.conf
    3132                Include conf.d/vhosts-common-ssl-cert.conf
     33                CustomLog /home/logview/debathena.log combined
    3234                SSLCertificateFile /etc/pki/tls/certs/debathena.pem
    33                 CustomLog /home/logview/debathena.log combined
     35                SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    3436        </VirtualHost>
    3537</IfModule>
Note: See TracChangeset for help on using the changeset viewer.