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 --- httpd-2.2.6/docs/conf/extra/httpd-ssl.conf.in 2007-03-07 08:33:58.000000000 +0100 +++ httpd-2.2.6-magellan/docs/conf/extra/httpd-ssl.conf.in 2007-09-07 19:43:49.000000000 +0200 @@ -96,16 +96,16 @@ # in mind that if you have both an RSA and a DSA certificate you # can configure both in parallel (to also allow the use of DSA # ciphers, etc.) -SSLCertificateFile "@exp_sysconfdir@/server.crt" -#SSLCertificateFile "@exp_sysconfdir@/server-dsa.crt" +SSLCertificateFile "@exp_sysconfdir@/ssl/server.crt" +#SSLCertificateFile "@exp_sysconfdir@/ssl/server-dsa.crt" # Server Private Key: # If the key is not combined with the certificate, use this # directive to point at the key file. Keep in mind that if # 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.) -SSLCertificateKeyFile "@exp_sysconfdir@/server.key" -#SSLCertificateKeyFile "@exp_sysconfdir@/server-dsa.key" +SSLCertificateKeyFile "@exp_sysconfdir@/ssl/server.key" +#SSLCertificateKeyFile "@exp_sysconfdir@/ssl/server-dsa.key" # Server Certificate Chain: # Point SSLCertificateChainFile at a file containing the @@ -114,7 +114,7 @@ # the referenced file can be the same as SSLCertificateFile # when the CA certificates are directly appended to the server # certificate for convinience. -#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 @@ -123,8 +123,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 @@ -133,8 +133,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" # Client Authentication (Type): # Client certificate verification type and depth. Types are