Ignore:
Timestamp:
Jun 27, 2012, 10:26:17 PM (12 years ago)
Author:
ezyang
Message:
Merging r2215 through r2244 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/blog.gregbrockman.com.conf

    r2195 r2245  
    1919                Include conf.d/vhosts-common-ssl.conf
    2020                SSLCertificateFile /etc/pki/tls/certs/blog.gregbrockman.com.pem
     21                SSLCertificateChainFile /etc/pki/tls/certs/blog.gregbrockman.com.pem
    2122                SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    22                 SSLCertificateChainFile /etc/pki/tls/certs/blog.gregbrockman.com.pem
    2323        </VirtualHost>
    2424        <VirtualHost *:444>
    … …  
    3131                Include conf.d/vhosts-common-ssl-cert.conf
    3232                SSLCertificateFile /etc/pki/tls/certs/blog.gregbrockman.com.pem
     33                SSLCertificateChainFile /etc/pki/tls/certs/blog.gregbrockman.com.pem
    3334                SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    34                 SSLCertificateChainFile /etc/pki/tls/certs/blog.gregbrockman.com.pem
    3535        </VirtualHost>
    3636</IfModule>
Note: See TracChangeset for help on using the changeset viewer.