| 1 | From 35db76c3663f77b49c1f1b1f0e07d108d6176c8c Mon Sep 17 00:00:00 2001
|
| 2 | From: Kaarle Ritvanen <[email protected]>
|
| 3 | Date: Fri, 11 Sep 2015 13:03:38 +0300
|
| 4 | Subject: [PATCH 09/14] httpd-ssl.conf SSL*File
|
| 5 |
|
| 6 | ---
|
| 7 | docs/conf/extra/httpd-ssl.conf.in | 22 +++++++++++-----------
|
| 8 | 1 file changed, 11 insertions(+), 11 deletions(-)
|
| 9 |
|
| 10 | diff --git a/docs/conf/extra/httpd-ssl.conf.in b/docs/conf/extra/httpd-ssl.conf.in
|
| 11 | index 75ce736..e80ad1a 100644
|
| 12 | |
| 13 | |
| 14 | @@ -142,9 +142,9 @@ SSLEngine on
|
| 15 | # Some ECC cipher suites (http://www.ietf.org/rfc/rfc4492.txt)
|
| 16 | # require an ECC certificate which can also be configured in
|
| 17 | # parallel.
|
| 18 | -SSLCertificateFile "@exp_sysconfdir@/server.crt"
|
| 19 | -#SSLCertificateFile "@exp_sysconfdir@/server-dsa.crt"
|
| 20 | -#SSLCertificateFile "@exp_sysconfdir@/server-ecc.crt"
|
| 21 | +SSLCertificateFile /etc/ssl/apache2/server.pem
|
| 22 | +#SSLCertificateFile /etc/ssl/apache2/server-dsa.pem
|
| 23 | +#SSLCertificateFile /etc/ssl/apache2/server-ecc.pem
|
| 24 |
|
| 25 | # Server Private Key:
|
| 26 | # If the key is not combined with the certificate, use this
|
| 27 | @@ -152,9 +152,9 @@ SSLCertificateFile "@exp_sysconfdir@/server.crt"
|
| 28 | # you've both a RSA and a DSA private key you can configure
|
| 29 | # both in parallel (to also allow the use of DSA ciphers, etc.)
|
| 30 | # ECC keys, when in use, can also be configured in parallel
|
| 31 | -SSLCertificateKeyFile "@exp_sysconfdir@/server.key"
|
| 32 | -#SSLCertificateKeyFile "@exp_sysconfdir@/server-dsa.key"
|
| 33 | -#SSLCertificateKeyFile "@exp_sysconfdir@/server-ecc.key"
|
| 34 | +SSLCertificateKeyFile /etc/ssl/apache2/server.key
|
| 35 | +#SSLCertificateKeyFile /etc/ssl/apache2/server-dsa.key
|
| 36 | +#SSLCertificateKeyFile /etc/ssl/apache2/server-ecc.key
|
| 37 |
|
| 38 | # Server Certificate Chain:
|
| 39 | # Point SSLCertificateChainFile at a file containing the
|
| 40 | @@ -163,7 +163,7 @@ SSLCertificateKeyFile "@exp_sysconfdir@/server.key"
|
| 41 | # the referenced file can be the same as SSLCertificateFile
|
| 42 | # when the CA certificates are directly appended to the server
|
| 43 | # certificate for convenience.
|
| 44 | -#SSLCertificateChainFile "@exp_sysconfdir@/server-ca.crt"
|
| 45 | +#SSLCertificateChainFile /etc/ssl/apache2/server-ca.pem
|
| 46 |
|
| 47 | # Certificate Authority (CA):
|
| 48 | # Set the CA certificate verification path where to find CA
|
| 49 | @@ -172,8 +172,8 @@ SSLCertificateKeyFile "@exp_sysconfdir@/server.key"
|
| 50 | # Note: Inside SSLCACertificatePath you need hash symlinks
|
| 51 | # to point to the certificate files. Use the provided
|
| 52 | # Makefile to update the hash symlinks after changes.
|
| 53 | -#SSLCACertificatePath "@exp_sysconfdir@/ssl.crt"
|
| 54 | -#SSLCACertificateFile "@exp_sysconfdir@/ssl.crt/ca-bundle.crt"
|
| 55 | +#SSLCACertificatePath /etc/ssl/apache2/ssl.crt
|
| 56 | +#SSLCACertificateFile /etc/ssl/apache2/ssl.crt/ca-bundle.pem
|
| 57 |
|
| 58 | # Certificate Revocation Lists (CRL):
|
| 59 | # Set the CA revocation path where to find CA CRLs for client
|
| 60 | @@ -184,8 +184,8 @@ SSLCertificateKeyFile "@exp_sysconfdir@/server.key"
|
| 61 | # Note: Inside SSLCARevocationPath you need hash symlinks
|
| 62 | # to point to the certificate files. Use the provided
|
| 63 | # Makefile to update the hash symlinks after changes.
|
| 64 | -#SSLCARevocationPath "@exp_sysconfdir@/ssl.crl"
|
| 65 | -#SSLCARevocationFile "@exp_sysconfdir@/ssl.crl/ca-bundle.crl"
|
| 66 | +#SSLCARevocationPath /etc/ssl/apache2/ssl.crl
|
| 67 | +#SSLCARevocationFile /etc/ssl/apache2/ssl.crl/ca-bundle.crl
|
| 68 | #SSLCARevocationCheck chain
|
| 69 |
|
| 70 | # Client Authentication (Type):
|
| 71 | --
|
| 72 | 2.9.4
|
| 73 |
|