Ignore:
Timestamp:
Jun 7, 2011, 12:58:14 PM (13 years ago)
Author:
achernya
Message:
Merge r1803-1877 from trunk to branches/fc15-dev
Location:
branches/fc15-dev
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/fc15-dev

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

    r1772 r1878  
    345345        Include conf.d/vhosts-common-ssl.conf
    346346        SSLCertificateFile /etc/pki/tls/certs/scripts.pem
     347        SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
     348        SSLCertificateChainFile /etc/pki/tls/certs/scripts.pem
    347349    </VirtualHost>
    348350    <VirtualHost 18.181.0.43:444>
    … …  
    352354        Include conf.d/vhosts-common-ssl-cert.conf
    353355        SSLCertificateFile /etc/pki/tls/certs/scripts.pem
     356        SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
     357        SSLCertificateChainFile /etc/pki/tls/certs/scripts.pem
    354358    </VirtualHost>
    355359    # LDAP vhost, w00t w00t
Note: See TracChangeset for help on using the changeset viewer.