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:
5 edited
2 copied

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

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

    r1552 r1878  
    1919                Include conf.d/vhosts-common-ssl.conf
    2020                SSLCertificateFile /etc/pki/tls/certs/finboard.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/finboard.pem
     32                SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    3133        </VirtualHost>
    3234</IfModule>

  • branches/fc15-dev/server/fedora/config/etc/httpd/vhosts.d/reify-vhost.py

    r1768 r1878  
    2525import sys
    2626
    27 ll = ldap.initialize("ldapi://%2fvar%2frun%2fdirsrv%2fslapd-scripts.socket/")
     27ll = ldap.initialize("ldapi://%2fvar%2frun%2fslapd-scripts.socket/")
    2828ll.simple_bind_s("", "")
    2929

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

    r1214 r1878  
    1919                Include conf.d/vhosts-common-ssl.conf
    2020                SSLCertificateFile /etc/pki/tls/certs/tours.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/tours.pem
     32                SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
    3133        </VirtualHost>
    3234</IfModule>
Note: See TracChangeset for help on using the changeset viewer.