summaryrefslogtreecommitdiff
path: root/www/apache20/files/patch-docs:conf:ssl-std.conf
diff options
context:
space:
mode:
Diffstat (limited to 'www/apache20/files/patch-docs:conf:ssl-std.conf')
-rw-r--r--www/apache20/files/patch-docs:conf:ssl-std.conf48
1 files changed, 34 insertions, 14 deletions
diff --git a/www/apache20/files/patch-docs:conf:ssl-std.conf b/www/apache20/files/patch-docs:conf:ssl-std.conf
index f647b91fac48..9dcf0d50384a 100644
--- a/www/apache20/files/patch-docs:conf:ssl-std.conf
+++ b/www/apache20/files/patch-docs:conf:ssl-std.conf
@@ -1,14 +1,34 @@
---- docs/conf/ssl-std.conf.orig Fri Nov 16 21:56:55 2001
-+++ docs/conf/ssl-std.conf Fri Nov 16 22:00:27 2001
-@@ -57,7 +57,7 @@
+--- docs/conf/ssl-std.conf.orig Thu Nov 8 07:16:09 2001
++++ docs/conf/ssl-std.conf Fri Feb 22 02:37:27 2002
+@@ -55,15 +55,15 @@
+ # Configure the SSL Session Cache: First the mechanism
+ # to use and second the expiring timeout (in seconds).
#SSLSessionCache none
- #SSLSessionCache shmht:logs/ssl_scache(512000)
- #SSLSessionCache shmcb:logs/ssl_scache(512000)
+-#SSLSessionCache shmht:logs/ssl_scache(512000)
+-#SSLSessionCache shmcb:logs/ssl_scache(512000)
-SSLSessionCache dbm:logs/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:/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 /var/log/httpd-ssl_engine_log
+ SSLLogLevel info
+
+ ##
@@ -99,11 +99,11 @@
<VirtualHost _default_:443>
@@ -30,8 +50,8 @@
# the use of DSA ciphers, etc.)
-SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server.crt
-#SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server-dsa.crt
-+SSLCertificateFile @@ServerRoot@@/etc/apache/ssl.crt/server.crt
-+#SSLCertificateFile @@ServerRoot@@/etc/apache/ssl.crt/server-dsa.crt
++SSLCertificateFile @@ServerRoot@@/etc/apache2/ssl.crt/server.crt
++#SSLCertificateFile @@ServerRoot@@/etc/apache2/ssl.crt/server-dsa.crt
# Server Private Key:
# If the key is not combined with the certificate, use this
@@ -40,8 +60,8 @@
# both in parallel (to also allow the use of DSA ciphers, etc.)
-SSLCertificateKeyFile @@ServerRoot@@/conf/ssl.key/server.key
-#SSLCertificateKeyFile @@ServerRoot@@/conf/ssl.key/server-dsa.key
-+SSLCertificateKeyFile @@ServerRoot@@/etc/apache/ssl.key/server.key
-+#SSLCertificateKeyFile @@ServerRoot@@/etc/apache/ssl.key/server-dsa.key
++SSLCertificateKeyFile @@ServerRoot@@/etc/apache2/ssl.key/server.key
++#SSLCertificateKeyFile @@ServerRoot@@/etc/apache2/ssl.key/server-dsa.key
# Server Certificate Chain:
# Point SSLCertificateChainFile at a file containing the
@@ -50,7 +70,7 @@
# when the CA certificates are directly appended to the server
# certificate for convinience.
-#SSLCertificateChainFile @@ServerRoot@@/conf/ssl.crt/ca.crt
-+#SSLCertificateChainFile @@ServerRoot@@/etc/apache/ssl.crt/ca.crt
++#SSLCertificateChainFile @@ServerRoot@@/etc/apache2/ssl.crt/ca.crt
# Certificate Authority (CA):
# Set the CA certificate verification path where to find CA
@@ -60,8 +80,8 @@
# Makefile to update the hash symlinks after changes.
-#SSLCACertificatePath @@ServerRoot@@/conf/ssl.crt
-#SSLCACertificateFile @@ServerRoot@@/conf/ssl.crt/ca-bundle.crt
-+#SSLCACertificatePath @@ServerRoot@@/etc/apache/ssl.crt
-+#SSLCACertificateFile @@ServerRoot@@/etc/apache/ssl.crt/ca-bundle.crt
++#SSLCACertificatePath @@ServerRoot@@/etc/apache2/ssl.crt
++#SSLCACertificateFile @@ServerRoot@@/etc/apache2/ssl.crt/ca-bundle.crt
# Certificate Revocation Lists (CRL):
# Set the CA revocation path where to find CA CRLs for client
@@ -71,8 +91,8 @@
# Makefile to update the hash symlinks after changes.
-#SSLCARevocationPath @@ServerRoot@@/conf/ssl.crl
-#SSLCARevocationFile @@ServerRoot@@/conf/ssl.crl/ca-bundle.crl
-+#SSLCARevocationPath @@ServerRoot@@/etc/apache/ssl.crl
-+#SSLCARevocationFile @@ServerRoot@@/etc/apache/ssl.crl/ca-bundle.crl
++#SSLCARevocationPath @@ServerRoot@@/etc/apache2/ssl.crl
++#SSLCARevocationFile @@ServerRoot@@/etc/apache2/ssl.crl/ca-bundle.crl
# Client Authentication (Type):
# Client certificate verification type and depth. Types are