Changeset 1938 for branches/fc15-dev/server/fedora/config/etc/httpd/conf

Timestamp:

Jul 31, 2011, 12:32:31 AM (12 years ago)

Author:

achernya

Message:

Merge r1878-r1937 from trunk to branches/fc15-dev

Location:

branches/fc15-dev

Files:

• . (modified) (1 prop)
• server/fedora/config/etc/httpd/conf/httpd.conf (modified) (1 diff)

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

@@ -338 +338 @@
         Include conf.d/vhosts-common-ssl.conf
         SSLCertificateFile /etc/pki/tls/certs/scripts-cert.pem
+        SSLCertificateKeyFile /etc/pki/tls/private/scripts.key
         Include conf.d/vhosts-common-ssl-cert.conf
     </VirtualHost>