You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sl...@apache.org on 2005/04/02 20:50:33 UTC
svn commit: r159791 - in httpd/httpd/branches/simple-conf/docs/conf:
extra/httpd-ssl.conf httpd-std.conf.in ssl-std.conf.in
Author: slive
Date: Sat Apr 2 10:50:32 2005
New Revision: 159791
URL: http://svn.apache.org/viewcvs?view=rev&rev=159791
Log:
Move ssl conf file to extra/ directory and remove the <IfDefine SSL>
nonsense: either you want SSL, or you don't (for 99% of cases).
Also add the correct relative directory pointer to the other
extra/ Includes.
Added:
httpd/httpd/branches/simple-conf/docs/conf/extra/httpd-ssl.conf
- copied, changed from r159781, httpd/httpd/branches/simple-conf/docs/conf/ssl-std.conf.in
Removed:
httpd/httpd/branches/simple-conf/docs/conf/ssl-std.conf.in
Modified:
httpd/httpd/branches/simple-conf/docs/conf/httpd-std.conf.in
Copied: httpd/httpd/branches/simple-conf/docs/conf/extra/httpd-ssl.conf (from r159781, httpd/httpd/branches/simple-conf/docs/conf/ssl-std.conf.in)
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/simple-conf/docs/conf/extra/httpd-ssl.conf?view=diff&rev=159791&p1=httpd/httpd/branches/simple-conf/docs/conf/ssl-std.conf.in&r1=159781&p2=httpd/httpd/branches/simple-conf/docs/conf/extra/httpd-ssl.conf&r2=159791
==============================================================================
--- httpd/httpd/branches/simple-conf/docs/conf/ssl-std.conf.in (original)
+++ httpd/httpd/branches/simple-conf/docs/conf/extra/httpd-ssl.conf Sat Apr 2 10:50:32 2005
@@ -21,18 +21,11 @@
# block. So, if available, use this one instead. Read the mod_ssl User
# Manual for more details.
#
-# Note: This must come before the <IfDefine SSL> container to support
-# starting without SSL on platforms with no /dev/random equivalent
-# but a statically compiled-in mod_ssl.
-#
-SSLRandomSeed startup builtin
-SSLRandomSeed connect builtin
#SSLRandomSeed startup file:/dev/random 512
#SSLRandomSeed startup file:/dev/urandom 512
#SSLRandomSeed connect file:/dev/random 512
#SSLRandomSeed connect file:/dev/urandom 512
-<IfDefine SSL>
#
# When we also provide SSL we have to listen to the
@@ -236,5 +229,3 @@
"%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
</VirtualHost>
-
-</IfDefine>
Modified: httpd/httpd/branches/simple-conf/docs/conf/httpd-std.conf.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/simple-conf/docs/conf/httpd-std.conf.in?view=diff&r1=159790&r2=159791
==============================================================================
--- httpd/httpd/branches/simple-conf/docs/conf/httpd-std.conf.in (original)
+++ httpd/httpd/branches/simple-conf/docs/conf/httpd-std.conf.in Sat Apr 2 10:50:32 2005
@@ -756,13 +756,6 @@
#</Location>
</IfModule>
-#
-# Bring in additional module-specific configurations
-#
-<IfModule ssl_module>
- Include @rel_sysconfdir@/ssl.conf
-</IfModule>
-
### Section 3: Virtual Hosts
#
@@ -806,10 +799,22 @@
# here and change as necessary.
# Multi-language error messages
-# Include extra/httpd-multilang-error.conf
+# Include @relsysconfdir@/extra/httpd-multilang-error.conf
# Fancy directory listings
-# Include extra/httpd-autoindex.conf
+# Include @relsysconfdir@/extra/httpd-autoindex.conf
# Language settings
-# Include extra/httpd-languages.conf
\ No newline at end of file
+# Include @relsysconfdir@/extra/httpd-languages.conf
+
+#
+# Secure (SSL/TLS) connections
+# Include @rel_sysconfdir@/extra/httpd-ssl.conf
+# Note: The following must must be present to support
+# starting without SSL on platforms with no /dev/random equivalent
+# but a statically compiled-in mod_ssl.
+#
+<IfModule ssl_module>
+SSLRandomSeed startup builtin
+SSLRandomSeed connect builtin
+</IfModule>
\ No newline at end of file