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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/simple-conf@159791 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/conf/ssl-std.conf.in b/docs/conf/extra/httpd-ssl.conf
similarity index 97%
rename from docs/conf/ssl-std.conf.in
rename to docs/conf/extra/httpd-ssl.conf
index b1d0d3f0e9bc191085b72987aa10856b1bd50b8d..de4ee9a2d2e13ca313be253b5fd6f4f752baf442 100644 (file)
--- a/docs/conf/ssl-std.conf.in
+++ b/docs/conf/extra/httpd-ssl.conf
@@ -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 @@ CustomLog @exp_logfiledir@/ssl_request_log \
           "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
 
 </VirtualHost>                                  
-
-</IfDefine>

diff --git a/docs/conf/httpd-std.conf.in b/docs/conf/httpd-std.conf.in
index 2d859ff08915421ab549380eaa6de2244ca29c7e..1c628b40102b5300e3c5c90ec4a5c556e6fc004b 100644 (file)
--- a/docs/conf/httpd-std.conf.in
+++ b/docs/conf/httpd-std.conf.in
@@ -756,13 +756,6 @@ ServerSignature On
     #</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 @@ ServerSignature On
 # 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