diff options
Diffstat (limited to 'www/apache2/files/patch-docs:conf:ssl-std.conf')
| -rw-r--r-- | www/apache2/files/patch-docs:conf:ssl-std.conf | 47 |
1 files changed, 19 insertions, 28 deletions
diff --git a/www/apache2/files/patch-docs:conf:ssl-std.conf b/www/apache2/files/patch-docs:conf:ssl-std.conf index 267aaae4d9e4..39ea9c6e7483 100644 --- a/www/apache2/files/patch-docs:conf:ssl-std.conf +++ b/www/apache2/files/patch-docs:conf:ssl-std.conf @@ -1,5 +1,5 @@ ---- docs/conf/ssl-std.conf.orig Thu Nov 8 07:16:09 2001 -+++ docs/conf/ssl-std.conf Sun Apr 7 09:26:02 2002 +--- docs/conf/ssl-std.conf.orig Fri May 17 04:05:24 2002 ++++ docs/conf/ssl-std.conf Tue Jun 18 23:15:32 2002 @@ -55,15 +55,15 @@ # Configure the SSL Session Cache: First the mechanism # to use and second the expiring timeout (in seconds). @@ -7,29 +7,20 @@ -#SSLSessionCache shmht:logs/ssl_scache(512000) -#SSLSessionCache shmcb:logs/ssl_scache(512000) -SSLSessionCache dbm:logs/ssl_scache -+#SSLSessionCache shmht:@@DESTDIR@@/var/log/httpd-ssl_scache(512000) -+#SSLSessionCache shmcb:@@DESTDIR@@/var/log/httpd-ssl_scache(512000) -+SSLSessionCache dbm:@@DESTDIR@@/var/log/httpd-ssl_scache ++#SSLSessionCache shmht:/var/log/httpd-ssl_scache(512000) ++#SSLSessionCache shmcb:/var/log/httpd-ssl_scache(512000) ++SSLSessionCache dbm:/var/log/httpd-ssl_scache SSLSessionCacheTimeout 300 # Semaphore: # Configure the path to the mutual exclusion semaphore the # SSL engine uses internally for inter-process synchronization. -SSLMutex file:logs/ssl_mutex -+SSLMutex file:@@DESTDIR@@/var/log/httpd-ssl_mutex ++SSLMutex file:/var/log/httpd-ssl_mutex # Pseudo Random Number Generator (PRNG): # Configure one or more sources to seed the PRNG of the -@@ -89,7 +89,7 @@ - # a real server (i.e. somewhere where only root can write). - # Log levels are (ascending order: higher ones include lower ones): - # none, error, warn, info, trace, debug. --SSLLog logs/ssl_engine_log -+SSLLog @@DESTDIR@@/var/log/httpd-ssl_engine_log - SSLLogLevel info - - ## -@@ -99,11 +99,11 @@ +@@ -89,11 +89,11 @@ <VirtualHost _default_:443> # General setup for the virtual host @@ -39,15 +30,15 @@ ServerAdmin you@your.address -ErrorLog logs/error_log -TransferLog logs/access_log -+ErrorLog @@DESTDIR@@/var/log/httpd-error.log -+TransferLog @@DESTDIR@@/var/log/httpd-access.log ++ErrorLog /var/log/httpd-error.log ++TransferLog /var/log/httpd-access.log # SSL Engine Switch: # Enable/Disable SSL for this virtual host. -@@ -122,16 +122,16 @@ - # built time. Keep in mind that if you've both a RSA and a DSA - # certificate you can configure both in parallel (to also allow - # the use of DSA ciphers, etc.) +@@ -111,16 +111,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 @@ServerRoot@@/conf/ssl.crt/server.crt -#SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server-dsa.crt +SSLCertificateFile @@ServerRoot@@/etc/apache2/ssl.crt/server.crt @@ -65,7 +56,7 @@ # Server Certificate Chain: # Point SSLCertificateChainFile at a file containing the -@@ -140,7 +140,7 @@ +@@ -129,7 +129,7 @@ # the referenced file can be the same as SSLCertificateFile # when the CA certificates are directly appended to the server # certificate for convinience. @@ -74,7 +65,7 @@ # Certificate Authority (CA): # Set the CA certificate verification path where to find CA -@@ -149,8 +149,8 @@ +@@ -138,8 +138,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. @@ -85,7 +76,7 @@ # Certificate Revocation Lists (CRL): # Set the CA revocation path where to find CA CRLs for client -@@ -159,8 +159,8 @@ +@@ -148,8 +148,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. @@ -96,7 +87,7 @@ # Client Authentication (Type): # Client certificate verification type and depth. Types are -@@ -220,7 +220,7 @@ +@@ -209,7 +209,7 @@ <Files ~ "\.(cgi|shtml|phtml|php3?)$"> SSLOptions +StdEnvVars </Files> @@ -105,12 +96,12 @@ SSLOptions +StdEnvVars </Directory> -@@ -255,7 +255,7 @@ +@@ -244,7 +244,7 @@ # 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 logs/ssl_request_log \ -+CustomLog @@DESTDIR@@/var/log/httpd-ssl_request.log \ ++CustomLog /var/log/httpd-ssl_request.log \ "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b" </VirtualHost> |