--- httpd-2.4.3/docs/conf/extra/httpd-ssl.conf.in 2012-08-14 23:59:24.000000000 +0000 +++ httpd-2.4.3-magellan/docs/conf/extra/httpd-ssl.conf.in 2012-10-31 12:39:33.905713598 +0000 @@ -103,9 +103,9 @@ # Some ECC cipher suites (http://www.ietf.org/rfc/rfc4492.txt) # require an ECC certificate which can also be configured in # parallel. -SSLCertificateFile "@exp_sysconfdir@/server.crt" -#SSLCertificateFile "@exp_sysconfdir@/server-dsa.crt" -#SSLCertificateFile "@exp_sysconfdir@/server-ecc.crt" +SSLCertificateFile "@exp_sysconfdir@/ssl/server.crt" +#SSLCertificateFile "@exp_sysconfdir@/ssl/server-dsa.crt" +#SSLCertificateFile "@exp_sysconfdir@/ssl/server-ecc.crt" # Server Private Key: # If the key is not combined with the certificate, use this @@ -113,9 +113,9 @@ # you've both a RSA and a DSA private key you can configure # both in parallel (to also allow the use of DSA ciphers, etc.) # ECC keys, when in use, can also be configured in parallel -SSLCertificateKeyFile "@exp_sysconfdir@/server.key" -#SSLCertificateKeyFile "@exp_sysconfdir@/server-dsa.key" -#SSLCertificateKeyFile "@exp_sysconfdir@/server-ecc.key" +SSLCertificateKeyFile "@exp_sysconfdir@/ssl/server.key" +#SSLCertificateKeyFile "@exp_sysconfdir@/ssl/server-dsa.key" +#SSLCertificateKeyFile "@exp_sysconfdir@/ssl/server-ecc.key" # Server Certificate Chain: # Point SSLCertificateChainFile at a file containing the @@ -124,7 +124,7 @@ # the referenced file can be the same as SSLCertificateFile # when the CA certificates are directly appended to the server # certificate for convenience. -#SSLCertificateChainFile "@exp_sysconfdir@/server-ca.crt" +#SSLCertificateChainFile "@exp_sysconfdir@/ssl/server-ca.crt" # Certificate Authority (CA): # Set the CA certificate verification path where to find CA @@ -133,8 +133,8 @@ # Note: Inside SSLCACertificatePath you need hash symlinks # to point to the certificate files. Use the provided # Makefile to update the hash symlinks after changes. -#SSLCACertificatePath "@exp_sysconfdir@/ssl.crt" -#SSLCACertificateFile "@exp_sysconfdir@/ssl.crt/ca-bundle.crt" +#SSLCACertificatePath "@exp_sysconfdir@/ssl/ssl.crt" +#SSLCACertificateFile "@exp_sysconfdir@/ssl/ssl.crt/ca-bundle.crt" # Certificate Revocation Lists (CRL): # Set the CA revocation path where to find CA CRLs for client @@ -145,8 +145,8 @@ # Note: Inside SSLCARevocationPath you need hash symlinks # to point to the certificate files. Use the provided # Makefile to update the hash symlinks after changes. -#SSLCARevocationPath "@exp_sysconfdir@/ssl.crl" -#SSLCARevocationFile "@exp_sysconfdir@/ssl.crl/ca-bundle.crl" +#SSLCARevocationPath "@exp_sysconfdir@/ssl/ssl.crl" +#SSLCARevocationFile "@exp_sysconfdir@/ssl/ssl.crl/ca-bundle.crl" #SSLCARevocationCheck chain # Client Authentication (Type):