From 5342738ffc9773e209ea984a2b05e12335bc2af2 Mon Sep 17 00:00:00 2001 From: Rich Bowen Date: Tue, 6 Apr 2010 13:04:03 +0000 Subject: [PATCH] Make the example match the descriptive text about the example. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@931138 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/vhosts/mass.html.en | 26 +++++++++++++++----------- docs/manual/vhosts/mass.xml | 24 ++++++++++++++---------- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/docs/manual/vhosts/mass.html.en b/docs/manual/vhosts/mass.html.en index 1687a211d5..529d92d261 100644 --- a/docs/manual/vhosts/mass.html.en +++ b/docs/manual/vhosts/mass.html.en @@ -36,7 +36,7 @@
  • Overview
  • Dynamic Virtual Hosts with mod_vhost_alias
    • -
  • A Virtually Hosted Homepages System
    • +
  • Simplified Dynamic Virtual Hosts
  • Using Multiple Virtual Hosting Systems on the Same Server
  • More Efficient IP-Based Virtual Hosting
    • @@ -139,8 +139,8 @@ NameVirtualHost 111.22.33.44 configuration, this is used by the core module when mapping URIs to filenames, but when the server is configured to do dynamic virtual hosting, that job must be taken over by another - module (either mod_vhost_alias or - mod_rewrite), which has a different way of doing + module (either mod_vhost_alias or + mod_rewrite), which has a different way of doing the mapping. Neither of these modules is responsible for setting the DOCUMENT_ROOT environment variable so if any CGIs or SSI documents make use of it, they will get a @@ -153,7 +153,7 @@ mod_vhost_alias

    This extract from httpd.conf implements the virtual host arrangement outlined in the Motivation section above - using mod_vhost_alias.

    + using mod_vhost_alias.

    # get the server name from the Host: header
    @@ -180,21 +180,24 @@ examples.

    top
    -

    A Virtually Hosted Homepages System

    +

    Simplified Dynamic Virtual Hosts

    This is an adjustment of the above system, tailored for an ISP's homepages server. Using a slightly more complicated configuration, we can select substrings of the server name to use in the filename so that, for example, the documents for www.user.isp.com are found in - /home/user/. It uses a single cgi-bin + /home/user/www. It uses a single cgi-bin directory instead of one per virtual host.

    -# all the preliminary stuff is the same as above, then
    +UseCanonicalName Off
    +
    +LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon
    +CustomLog logs/access_log vcommon

    # include part of the server name in the filenames
    -VirtualDocumentRoot /www/hosts/%2/docs
    +VirtualDocumentRoot /home/%2/www

    # single cgi-bin directory
    ScriptAlias /cgi-bin/ /www/std-cgi/
    @@ -214,8 +217,9 @@ ScriptAlias /cgi-bin/ /www/std-cgi/
    scope of the various virtual hosting configurations. For example, you could have one IP address for general customers' homepages, and another for commercial customers, with the following setup. - This can, of course, be combined with conventional - <VirtualHost> configuration sections.

    + This can be combined with conventional + <VirtualHost> configuration sections, as shown + below.

    UseCanonicalName Off
    @@ -265,7 +269,7 @@ LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon
    ServerName directive, the reverse DNS of the relevant IP will be used instead. If this is not the server name you - wish to use, a bogus entry (ServerName + wish to use, a bogus entry (eg. ServerName none.example.com) can be added to get around this behaviour.

    diff --git a/docs/manual/vhosts/mass.xml b/docs/manual/vhosts/mass.xml index 41984cfa23..29d8cd4f16 100644 --- a/docs/manual/vhosts/mass.xml +++ b/docs/manual/vhosts/mass.xml @@ -133,8 +133,8 @@ NameVirtualHost 111.22.33.44 configuration, this is used by the core module when mapping URIs to filenames, but when the server is configured to do dynamic virtual hosting, that job must be taken over by another - module (either mod_vhost_alias or - mod_rewrite), which has a different way of doing + module (either mod_vhost_alias or + mod_rewrite), which has a different way of doing the mapping. Neither of these modules is responsible for setting the DOCUMENT_ROOT environment variable so if any CGIs or SSI documents make use of it, they will get a @@ -148,7 +148,7 @@ mod_vhost_alias

    This extract from httpd.conf implements the virtual host arrangement outlined in the Motivation section above - using mod_vhost_alias.

    + using mod_vhost_alias.

    # get the server name from the Host: header
    @@ -175,21 +175,24 @@ examples.

    -
    A Virtually Hosted Homepages System +
    Simplified Dynamic Virtual Hosts

    This is an adjustment of the above system, tailored for an ISP's homepages server. Using a slightly more complicated configuration, we can select substrings of the server name to use in the filename so that, for example, the documents for www.user.isp.com are found in - /home/user/. It uses a single cgi-bin + /home/user/www. It uses a single cgi-bin directory instead of one per virtual host.

    -# all the preliminary stuff is the same as above, then
    +UseCanonicalName Off
    +
    +LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon
    +CustomLog logs/access_log vcommon

    # include part of the server name in the filenames
    -VirtualDocumentRoot /www/hosts/%2/docs
    +VirtualDocumentRoot /home/%2/www

    # single cgi-bin directory
    ScriptAlias /cgi-bin/ /www/std-cgi/
    @@ -209,8 +212,9 @@ ScriptAlias /cgi-bin/ /www/std-cgi/
    scope of the various virtual hosting configurations. For example, you could have one IP address for general customers' homepages, and another for commercial customers, with the following setup. - This can, of course, be combined with conventional - <VirtualHost> configuration sections.

    + This can be combined with conventional + <VirtualHost> configuration sections, as shown + below.

    UseCanonicalName Off
    @@ -260,7 +264,7 @@ LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon
    ServerName directive, the reverse DNS of the relevant IP will be used instead. If this is not the server name you - wish to use, a bogus entry (ServerName + wish to use, a bogus entry (eg. ServerName none.example.com) can be added to get around this behaviour.

    -- 2.40.0