Annotation of /trunk/apache2/patches/apache2-2.2.6-default-ssl-settings.patch
Parent Directory | Revision Log
Revision 339 -
(hide annotations)
(download)
Fri Sep 7 17:46:04 2007 UTC (17 years ago) by niro
File size: 2786 byte(s)
Fri Sep 7 17:46:04 2007 UTC (17 years ago) by niro
File size: 2786 byte(s)
-re-diffed for apache2-2.2.6
1 | niro | 339 | diff -Naur httpd-2.2.6/docs/conf/extra/httpd-ssl.conf.in httpd-2.2.6-magellan/docs/conf/extra/httpd-ssl.conf.in |
2 | --- httpd-2.2.6/docs/conf/extra/httpd-ssl.conf.in 2007-03-07 08:33:58.000000000 +0100 | ||
3 | +++ httpd-2.2.6-magellan/docs/conf/extra/httpd-ssl.conf.in 2007-09-07 19:43:49.000000000 +0200 | ||
4 | @@ -96,16 +96,16 @@ | ||
5 | # in mind that if you have both an RSA and a DSA certificate you | ||
6 | # can configure both in parallel (to also allow the use of DSA | ||
7 | # ciphers, etc.) | ||
8 | -SSLCertificateFile "@exp_sysconfdir@/server.crt" | ||
9 | -#SSLCertificateFile "@exp_sysconfdir@/server-dsa.crt" | ||
10 | +SSLCertificateFile "@exp_sysconfdir@/ssl/server.crt" | ||
11 | +#SSLCertificateFile "@exp_sysconfdir@/ssl/server-dsa.crt" | ||
12 | |||
13 | # Server Private Key: | ||
14 | # If the key is not combined with the certificate, use this | ||
15 | # directive to point at the key file. Keep in mind that if | ||
16 | # you've both a RSA and a DSA private key you can configure | ||
17 | # both in parallel (to also allow the use of DSA ciphers, etc.) | ||
18 | -SSLCertificateKeyFile "@exp_sysconfdir@/server.key" | ||
19 | -#SSLCertificateKeyFile "@exp_sysconfdir@/server-dsa.key" | ||
20 | +SSLCertificateKeyFile "@exp_sysconfdir@/ssl/server.key" | ||
21 | +#SSLCertificateKeyFile "@exp_sysconfdir@/ssl/server-dsa.key" | ||
22 | |||
23 | # Server Certificate Chain: | ||
24 | # Point SSLCertificateChainFile at a file containing the | ||
25 | @@ -114,7 +114,7 @@ | ||
26 | # the referenced file can be the same as SSLCertificateFile | ||
27 | # when the CA certificates are directly appended to the server | ||
28 | # certificate for convinience. | ||
29 | -#SSLCertificateChainFile "@exp_sysconfdir@/server-ca.crt" | ||
30 | +#SSLCertificateChainFile "@exp_sysconfdir@/ssl/server-ca.crt" | ||
31 | |||
32 | # Certificate Authority (CA): | ||
33 | # Set the CA certificate verification path where to find CA | ||
34 | @@ -123,8 +123,8 @@ | ||
35 | # Note: Inside SSLCACertificatePath you need hash symlinks | ||
36 | # to point to the certificate files. Use the provided | ||
37 | # Makefile to update the hash symlinks after changes. | ||
38 | -#SSLCACertificatePath "@exp_sysconfdir@/ssl.crt" | ||
39 | -#SSLCACertificateFile "@exp_sysconfdir@/ssl.crt/ca-bundle.crt" | ||
40 | +#SSLCACertificatePath "@exp_sysconfdir@/ssl/ssl.crt" | ||
41 | +#SSLCACertificateFile "@exp_sysconfdir@/ssl/ssl.crt/ca-bundle.crt" | ||
42 | |||
43 | # Certificate Revocation Lists (CRL): | ||
44 | # Set the CA revocation path where to find CA CRLs for client | ||
45 | @@ -133,8 +133,8 @@ | ||
46 | # Note: Inside SSLCARevocationPath you need hash symlinks | ||
47 | # to point to the certificate files. Use the provided | ||
48 | # Makefile to update the hash symlinks after changes. | ||
49 | -#SSLCARevocationPath "@exp_sysconfdir@/ssl.crl" | ||
50 | -#SSLCARevocationFile "@exp_sysconfdir@/ssl.crl/ca-bundle.crl" | ||
51 | +#SSLCARevocationPath "@exp_sysconfdir@/ssl/ssl.crl" | ||
52 | +#SSLCARevocationFile "@exp_sysconfdir@/ssl/ssl.crl/ca-bundle.crl" | ||
53 | |||
54 | # Client Authentication (Type): | ||
55 | # Client certificate verification type and depth. Types are |