Move vhost example to extra/. Also improve the comment

and the "default" vhost issue, and add a second <VirtualHost>
section since it doesn't make sense to add just one.

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

diff --git a/docs/conf/extra/httpd-vhosts.conf b/docs/conf/extra/httpd-vhosts.conf
new file mode 100644 (file)
index 0000000..86b6375
--- /dev/null
+++ b/docs/conf/extra/httpd-vhosts.conf
@@ -0,0 +1,44 @@
+#
+# Virtual Hosts
+#
+# If you want to maintain multiple domains/hostnames on your
+# machine you can setup VirtualHost containers for them. Most configurations
+# use only name-based virtual hosts so the server doesn't need to worry about
+# IP addresses. This is indicated by the asterisks in the directives below.
+#
+# Please see the documentation at 
+# <URL:http://httpd.apache.org/docs-2.1/vhosts/>
+# for further details before you try to setup virtual hosts.
+#
+# You may use the command line option '-S' to verify your virtual host
+# configuration.
+
+#
+# Use name-based virtual hosting.
+#
+NameVirtualHost *:80
+
+#
+# VirtualHost example:
+# Almost any Apache directive may go into a VirtualHost container.
+# The first VirtualHost section is used for all requests that do not
+# match a ServerName or ServerAlias in any <VirtualHost> block.
+#
+<VirtualHost *:80>
+    ServerAdmin webmaster@dummy-host.example.com
+    DocumentRoot /www/docs/dummy-host.example.com
+    ServerName dummy-host.example.com
+    ErrorLog @rel_logfiledir@/dummy-host.example.com-error_log
+    CustomLog @rel_logfiledir@/dummy-host.example.com-access_log common
+</VirtualHost>
+
+<VirtualHost *:80>
+    ServerAdmin webmaster@dummy-host.example.com
+    DocumentRoot /www/docs/dummy-host2.example.com
+    ServerName dummy-host2.example.com
+    ErrorLog @rel_logfiledir@/dummy-host.example.com-error_log
+    CustomLog @rel_logfiledir@/dummy-host.example.com-access_log common
+</VirtualHost>
+
+
+

diff --git a/docs/conf/httpd-std.conf.in b/docs/conf/httpd-std.conf.in
index 0064e4963c845652a9112ec66cf6adb73f29f5da..c5e38f1c5f4b7cc3c333c019089b06641dc67383 100644 (file)
--- a/docs/conf/httpd-std.conf.in
+++ b/docs/conf/httpd-std.conf.in
@@ -617,10 +617,6 @@ ServerSignature On
     AddType application/x-compress .Z
     AddType application/x-gzip .gz .tgz
 
-</IfModule>
-
-<IfModule mime_module>
-
     #
     # AddHandler allows you to map certain file extensions to "handlers":
     # actions unrelated to filetype. These can be either built into the server
@@ -703,41 +699,6 @@ ServerSignature On
 </IfModule>
 
 
-### Section 3: Virtual Hosts
-#
-# VirtualHost: If you want to maintain multiple domains/hostnames on your
-# machine you can setup VirtualHost containers for them. Most configurations
-# use only name-based virtual hosts so the server doesn't need to worry about
-# IP addresses. This is indicated by the asterisks in the directives below.
-#
-# Please see the documentation at 
-# <URL:http://httpd.apache.org/docs-2.1/vhosts/>
-# for further details before you try to setup virtual hosts.
-#
-# You may use the command line option '-S' to verify your virtual host
-# configuration.
-
-#
-# Use name-based virtual hosting.
-#
-#NameVirtualHost *:80
-
-#
-# VirtualHost example:
-# Almost any Apache directive may go into a VirtualHost container.
-# The first VirtualHost section is used for requests without a known
-# server name.
-#
-#<VirtualHost *:80>
-#    ServerAdmin webmaster@dummy-host.example.com
-#    DocumentRoot /www/docs/dummy-host.example.com
-#    ServerName dummy-host.example.com
-#    ErrorLog @rel_logfiledir@/dummy-host.example.com-error_log
-#    CustomLog @rel_logfiledir@/dummy-host.example.com-access_log common
-#</VirtualHost>
-
-
-
 ##### Supplemental configuration
 #
 # The configuration files in the extra/ directory can be included
@@ -759,6 +720,9 @@ ServerSignature On
 # Real-time info on requests and configuration
 # Include @relsysconfdir@/extra/httpd-info.conf
 
+# Virtual hosts
+# Include @relsysconfdir@/extra/httpd-vhosts.conf
+
 #
 # Secure (SSL/TLS) connections
 # Include @rel_sysconfdir@/extra/httpd-ssl.conf