Ignore:
Timestamp:
Nov 15, 2013, 11:35:17 PM (10 years ago)
Author:
achernya
Message:
Merge r2435-2485 from trunk to branches/fc19-dev
Location:
branches/fc19-dev
Files:
3 edited
8 copied

Legend:

Unmodified
Added
Removed

  • branches/fc19-dev

  • branches/fc19-dev/server/fedora/config/etc/httpd/conf/httpd.conf

    r2321 r2487  
    330330    SSLCryptoDevice builtin
    331331    SSLCertificateFile /etc/pki/tls/certs/star.scripts.pem
    332     SSLCertificateKeyFile /etc/pki/tls/private/scripts-1024.key
     332    SSLCertificateChainFile /etc/pki/tls/certs/star.scripts.pem
     333    SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    333334    SSLCACertificateFile /etc/pki/tls/certs/ca.pem
    334335    SSLVerifyClient none
    … …  
    383384        ServerAlias *.scripts.mit.edu *.scripts
    384385        SSLCertificateFile /etc/pki/tls/certs/star.scripts.pem
     386        SSLCertificateChainFile /etc/pki/tls/certs/star.scripts.pem
    385387        Include conf.d/vhost_ldap.conf
    386388        Include conf.d/vhosts-common-ssl.conf
    … …  
    395397        ServerAlias *.scripts.mit.edu *.scripts
    396398        SSLCertificateFile /etc/pki/tls/certs/star.scripts.pem
     399        SSLCertificateChainFile /etc/pki/tls/certs/star.scripts.pem
    397400        Include conf.d/vhost_ldap.conf
    398401        Include conf.d/vhosts-common-ssl.conf

  • branches/fc19-dev/server/fedora/config/etc/httpd/vhosts.d/barnowl.conf

    r2331 r2487  
    44        ServerName barnowl.mit.edu
    55        ServerAlias barnowl
    6         DocumentRoot /afs/sipb.mit.edu/project/barnowl/web_scripts
    7         Alias /~barnowl /afs/sipb.mit.edu/project/barnowl/web_scripts
     6        DocumentRoot /afs/.sipb.mit.edu/project/barnowl/web_scripts
     7        Alias /~barnowl /afs/.sipb.mit.edu/project/barnowl/web_scripts
    88        SuExecUserGroup barnowl barnowl
    99        Include conf.d/vhosts-common.conf
    … …  
    1414                ServerName barnowl.mit.edu
    1515                ServerAlias barnowl
    16                 DocumentRoot /afs/sipb.mit.edu/project/barnowl/web_scripts
    17                 Alias /~barnowl /afs/sipb.mit.edu/project/barnowl/web_scripts
     16                DocumentRoot /afs/.sipb.mit.edu/project/barnowl/web_scripts
     17                Alias /~barnowl /afs/.sipb.mit.edu/project/barnowl/web_scripts
    1818                SuExecUserGroup barnowl barnowl
    1919                Include conf.d/vhosts-common-ssl.conf
    … …  
    2525                ServerName barnowl.mit.edu
    2626                ServerAlias barnowl
    27                 DocumentRoot /afs/sipb.mit.edu/project/barnowl/web_scripts
    28                 Alias /~barnowl /afs/sipb.mit.edu/project/barnowl/web_scripts
     27                DocumentRoot /afs/.sipb.mit.edu/project/barnowl/web_scripts
     28                Alias /~barnowl /afs/.sipb.mit.edu/project/barnowl/web_scripts
    2929                SuExecUserGroup barnowl barnowl
    3030                Include conf.d/vhosts-common-ssl.conf
Note: See TracChangeset for help on using the changeset viewer.