From: Guenter Knauf <fuankg@apache.org>
Date: Tue, 16 Apr 2013 19:39:20 +0000 (+0000)
Subject: Changed @exp_sysconfdir@ / @exp_logfiledir@ to relative paths.
X-Git-Tag: 2.5.0-alpha~5577
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c59ebd84216056d41d56478df052512cb4144066;p=apache

Changed @exp_sysconfdir@ / @exp_logfiledir@ to relative paths.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1468575 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/conf/extra/httpd-ssl.conf.in b/docs/conf/extra/httpd-ssl.conf.in
index e7c6204ab7..8f758e0c7b 100644
--- a/docs/conf/extra/httpd-ssl.conf.in
+++ b/docs/conf/extra/httpd-ssl.conf.in
@@ -86,8 +86,8 @@ SSLSessionCacheTimeout  300
 DocumentRoot "@exp_htdocsdir@"
 ServerName www.example.com:@@SSLPort@@
 ServerAdmin you@example.com
-ErrorLog "@exp_logfiledir@/error_log"
-TransferLog "@exp_logfiledir@/access_log"
+ErrorLog "@rel_logfiledir@/error_log"
+TransferLog "@rel_logfiledir@/access_log"
 
 #   SSL Engine Switch:
 #   Enable/Disable SSL for this virtual host.
@@ -103,9 +103,9 @@ SSLEngine on
 #   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 "@rel_sysconfdir@/server.crt"
+#SSLCertificateFile "@rel_sysconfdir@/server-dsa.crt"
+#SSLCertificateFile "@rel_sysconfdir@/server-ecc.crt"
 
 #   Server Private Key:
 #   If the key is not combined with the certificate, use this
@@ -113,9 +113,9 @@ SSLCertificateFile "@exp_sysconfdir@/server.crt"
 #   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 "@rel_sysconfdir@/server.key"
+#SSLCertificateKeyFile "@rel_sysconfdir@/server-dsa.key"
+#SSLCertificateKeyFile "@rel_sysconfdir@/server-ecc.key"
 
 #   Server Certificate Chain:
 #   Point SSLCertificateChainFile at a file containing the
@@ -124,7 +124,7 @@ SSLCertificateKeyFile "@exp_sysconfdir@/server.key"
 #   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 "@rel_sysconfdir@/server-ca.crt"
 
 #   Certificate Authority (CA):
 #   Set the CA certificate verification path where to find CA
@@ -133,8 +133,8 @@ SSLCertificateKeyFile "@exp_sysconfdir@/server.key"
 #   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 "@rel_sysconfdir@/ssl.crt"
+#SSLCACertificateFile "@rel_sysconfdir@/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 @@ SSLCertificateKeyFile "@exp_sysconfdir@/server.key"
 #   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 "@rel_sysconfdir@/ssl.crl"
+#SSLCARevocationFile "@rel_sysconfdir@/ssl.crl/ca-bundle.crl"
 #SSLCARevocationCheck chain
 
 #   Client Authentication (Type):
@@ -162,8 +162,8 @@ SSLCertificateKeyFile "@exp_sysconfdir@/server.key"
 #   file (containing login information for SRP user accounts). 
 #   Requires OpenSSL 1.0.1 or newer. See the mod_ssl FAQ for
 #   detailed instructions on creating this file. Example:
-#   "openssl srp -srpvfile @exp_sysconfdir@/passwd.srpv -add username"
-#SSLSRPVerifierFile "@exp_sysconfdir@/passwd.srpv"
+#   "openssl srp -srpvfile @rel_sysconfdir@/passwd.srpv -add username"
+#SSLSRPVerifierFile "@rel_sysconfdir@/passwd.srpv"
 
 #   Access Control:
 #   With SSLRequire you can do per-directory access control based
@@ -246,7 +246,7 @@ BrowserMatch "MSIE [2-5]" \
 #   Per-Server Logging:
 #   The home of a custom SSL log file. Use this when you want a
 #   compact non-error SSL logfile on a virtual host basis.
-CustomLog "@exp_logfiledir@/ssl_request_log" \
+CustomLog "@rel_logfiledir@/ssl_request_log" \
           "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
 
 </VirtualHost>