Ignore:
Timestamp:
Nov 9, 2011, 12:28:15 AM (11 years ago)
Author:
achernya
Message:
Merge r2026-r2038 from trunk to braches/fc15-dev
Location:
branches/fc15-dev
Files:
5 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/fc15-dev

    • Property svn:mergeinfo changed
      /trunkmerged: 2038

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

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

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

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

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

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

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

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