Ignore:
Timestamp:
Sep 6, 2011, 4:30:47 PM (13 years ago)
Author:
ezyang
Message:
Merge r1947-r1972 from trunk to branches/fc15-dev
Location:
branches/fc15-dev
Files:
3 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/fc15-dev

  • branches/fc15-dev/server/fedora/config/etc/httpd/vhosts.d/ai6034.conf

    r1325 r1973  
    1919                Include conf.d/vhosts-common-ssl.conf
    2020                SSLCertificateFile /etc/pki/tls/certs/ai6034.pem
     21                SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    2122        </VirtualHost>
    2223        <VirtualHost *:444>
    … …  
    2930                Include conf.d/vhosts-common-ssl-cert.conf
    3031                SSLCertificateFile /etc/pki/tls/certs/ai6034.pem
     32                SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    3133        </VirtualHost>
    3234</IfModule>

  • branches/fc15-dev/server/fedora/config/etc/httpd/vhosts.d/isawyou.conf

    r1776 r1973  
    44        ServerName isawyou.mit.edu
    55        ServerAlias isawyou
    6         DocumentRoot /afs/athena.mit.edu/user/k/e/keone/web_scripts/isawyou
    7         Alias /~keone /afs/athena.mit.edu/user/k/e/keone/web_scripts
    8         SuExecUserGroup keone keone
     6        DocumentRoot /afs/sipb.mit.edu/contrib/isawyou/web_scripts
     7        Alias /~isawyou /afs/sipb.mit.edu/contrib/isawyou/web_scripts
     8        SuExecUserGroup isawyou isawyou
    99        Include conf.d/vhosts-common.conf
    1010</VirtualHost>
    … …  
    1414                ServerName isawyou.mit.edu
    1515                ServerAlias isawyou
    16                 DocumentRoot /afs/athena.mit.edu/user/k/e/keone/web_scripts/isawyou
    17                 Alias /~keone /afs/athena.mit.edu/user/k/e/keone/web_scripts
    18                 SuExecUserGroup keone keone
     16                DocumentRoot /afs/sipb.mit.edu/contrib/isawyou/web_scripts
     17                Alias /~isawyou /afs/sipb.mit.edu/contrib/isawyou/web_scripts
     18                SuExecUserGroup isawyou isawyou
    1919                Include conf.d/vhosts-common-ssl.conf
    2020                SSLCertificateFile /etc/pki/tls/certs/isawyou.pem
    … …  
    2424                ServerName isawyou.mit.edu
    2525                ServerAlias isawyou
    26                 DocumentRoot /afs/athena.mit.edu/user/k/e/keone/web_scripts/isawyou
    27                 Alias /~keone /afs/athena.mit.edu/user/k/e/keone/web_scripts
    28                 SuExecUserGroup keone keone
     26                DocumentRoot /afs/sipb.mit.edu/contrib/isawyou/web_scripts
     27                Alias /~isawyou /afs/sipb.mit.edu/contrib/isawyou/web_scripts
     28                SuExecUserGroup isawyou isawyou
    2929                Include conf.d/vhosts-common-ssl.conf
    3030                Include conf.d/vhosts-common-ssl-cert.conf
Note: See TracChangeset for help on using the changeset viewer.