Commit 8ccf4d70 authored by Martin Kraemer's avatar Martin Kraemer
Browse files

Citing Lars:

Hi,

the attachment includes a reworked Apache manual with the
new virtual host documentation.

As Dean suggested I created a new directory named 'vhosts' and moved the
updated vhosts-in-depth etc. documents into the new directory, renamed
them and updated all other documents which refered to the old docs
(at least I tried to find all documents...).

Submitted by: Lars Eilebrecht <sfx@unix-ag.org>
Reviewed by:	 Martin Kraemer


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@79568 13f79535-47bb-0310-9956-ffa450edef68
parent 7d77f2f1
Loading
Loading
Loading
Loading
+1 −2
Changes for docs/manual/bind.html: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -95,8 +95,7 @@ not listening to, it cannot be accessed.
<h2>See also</h2>

See also the documentation on
<a href="virtual-host.html">Virtual Hosts</a>,
<a href="host.html">Non-IP virtual hosts</a>,
<a href="vhosts/index.html">Virtual Hosts</a>,
<a href="mod/core.html#bindaddress">BindAddress directive</a>,
<a href="mod/core.html#port">Port directive</a>,
<a href="dns-caveats.html">DNS Issues</a>
+1 −2
Changes for docs/manual/bind.html.en: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -95,8 +95,7 @@ not listening to, it cannot be accessed.
<h2>See also</h2>

See also the documentation on
<a href="virtual-host.html">Virtual Hosts</a>,
<a href="host.html">Non-IP virtual hosts</a>,
<a href="vhosts/index.html">Virtual Hosts</a>,
<a href="mod/core.html#bindaddress">BindAddress directive</a>,
<a href="mod/core.html#port">Port directive</a>,
<a href="dns-caveats.html">DNS Issues</a>
+2 −14
Changes for docs/manual/dns-caveats.html: 2 added lines, 14 removed lines.
Original line number Diff line number Diff line
@@ -113,11 +113,11 @@ in URLs of the form <code>http://www.abc.dom/whatever</code>) will all be
served by the <code>def.com</code> virtual host.  To better understand why
this happens requires a more in-depth discussion of how Apache matches
up incoming requests with the virtual host that will serve it.  A rough
document describing this <a href="vhosts-in-depth.html"> is available</a>.
document describing this <a href="vhosts/details.html"> is available</a>.

<h3>The "main server" Address</h3>

<p>The addition of <a href="host.html">non-IP-based virtual host
<p>The addition of <a href="vhosts/name-based.html">name-based virtual host
support</a> in Apache 1.1 requires Apache to know the IP address(es) of
the host that httpd is running on.  To get this address it uses either
the global <code>ServerName</code> (if present) or calls the C function
@@ -141,18 +141,6 @@ CGIs unless you use <a href="mod/mod_env.html"><code>mod_env</code></a>
to control the environment.  It's best to consult the man pages or FAQs
for your OS.

<h3>The _default_ Address</h3>

<p>Any address that happens to go to your webserver which doesn't match
the IP address of any of the webservers will be served from the "main" or
"default" server configurations.  The "main" server configuration consists
of all those definitions appearing outside of any VirtualHost section.
You may want instead to define a <code>&lt;VirtualHost _default_:*&gt;</code>
which returns 403 or 404 for all hits.  (The trailing <code>:*</code>
makes it apply to all ports, which is just a safety measure should you
begin using multiple <code><a href="mod/core.html#listen">Listen</a></code>
directives.)

<h3><a name="tips">Tips to Avoid these problems</a></h3>

<ul>
+12 −4
Changes for docs/manual/misc/FAQ.html: 12 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@
  <!--#include virtual="header.html" -->
  <H1 ALIGN="CENTER">Apache Server Frequently Asked Questions</H1>
  <P>
  $Revision: 1.93 $ ($Date: 1997/11/06 14:52:47 $)
  $Revision: 1.94 $ ($Date: 1997/11/11 23:47:15 $)
  </P>
  <P>
  The latest version of this FAQ is always available from the main
@@ -254,7 +254,7 @@
   </LI>
   <LI><A HREF="#year2000">Is Apache Year 2000 compliant?</A>
   </LI>
   <LI><A HREF="#namevhost">I upgraded to Apache 1.3b2 and now my
   <LI><A HREF="#namevhost">I upgraded to Apache 1.3b and now my
    virtual hosts don't work!</A>
   </LI>
  </OL>
@@ -420,7 +420,10 @@
   REL="Help"
  ><CITE>Apache Week</CITE></A>
  available.  Links to relevant <CITE>Apache Week</CITE> articles are
  included below where appropriate.
  included below where appropriate. There are also some 
  <A
   HREF="http://www.apache.org/info/apache_books.html"
  >Apache-specific books</A> available.
  </P>
  <HR>
 </LI>
@@ -2111,7 +2114,7 @@
  <HR>
 </LI>
 <LI><A NAME="namevhost">
      <STRONG>I upgraded to Apache 1.3b2 and now my virtual hosts don't
      <STRONG>I upgraded to Apache 1.3b and now my virtual hosts don't
      work!</STRONG>
     </A>
  <P>
@@ -2150,6 +2153,11 @@
  contain <SAMP>ServerName</SAMP> and possibly <SAMP>ServerAlias</SAMP>
  directives so Apache can be sure to tell them apart correctly.
  </P>
  <P>
  Please see the
  <A HREF="http://www.apache.org/docs/vhosts/index.html">Apache
  Virtual Host documentation</A> for further details about configuration.
  </P>
  <HR>
 </LI>

+41 −14
Changes for docs/manual/mod/core.html: 41 added lines, 14 removed lines.
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ always available.
<li><A HREF="#maxrequestsperchild">MaxRequestsPerChild</A>
<li><A HREF="#maxspareservers">MaxSpareServers</A>
<li><A HREF="#minspareservers">MinSpareServers</A>
<li><A HREF="#namevirtualhost">NameVirtualHost</A>
<li><A HREF="#options">Options</A>
<li><A HREF="#pidfile">PidFile</A>
<li><A HREF="#port">Port</A>
@@ -252,7 +253,7 @@ control over which address and ports Apache listens to, use the
<code>BindAddress</code>.<p>

<code>BindAddress</code> can be used as an alternative method for
supporting <A HREF="../virtual-host.html">virtual hosts</A> using
supporting <A HREF="../vhosts/index.html">virtual hosts</A> using
multiple independent servers, instead of using <code><A
HREF="#virtualhost">&lt;VirtualHost&gt;</A></code> sections.

@@ -1111,6 +1112,34 @@ Setting this parameter to a large number is almost always a bad idea.<p>
See also <A HREF="#maxspareservers">MaxSpareServers</A> and
<A HREF="#startservers">StartServers</A>.<p><hr>

<h2><A name="namevirtualhost">NameVirtualHost directive</A></h2>
<!--%plaintext &lt;?INDEX {\tt NameVirtualHost} directive&gt; -->
<strong>Syntax:</strong> NameVirtualHost <em>addr</em>[:<em>port</em>]<br>
<strong>Context:</strong> server config<br>
<strong>Status:</strong> core<p>
<strong>Compatibility:</strong> NameVirtualHost is only available in Apache 1.3 and later<p>

The NameVirtualHost directive is a required directive if you want to configure
<A HREF="../vhosts/index.html">name-based virtual hosts</A>.<p>

Although <em>addr</em> can be hostname it is recommended that you always use
an IP address, e.g.

<blockquote><code>NameVirtualHost 111.22.33.44</code></blockquote>

With the NameVirtualHost directive the address to which your name-based
virtual host names resolve.
If you have multiple name-based hosts on multiple addresses,
repeat the directive for each address.<p>

Optionally you can specify a port number on which the name-based
virtual hosts should be used, e.g.

<blockquote><code>NameVirtualHost 111.22.33.44:8080</code></blockquote>

<strong>See also:</strong>
<a href="../vhosts/index.html">Apache Virtual Host documentation</a>

<h2><A name="options">Options directive</A></h2>
<!--%plaintext &lt;?INDEX {\tt Options} directive&gt; -->
<strong>Syntax:</strong> Options <em>[+|-]option [+|-]option ...</em><br>
@@ -1490,9 +1519,10 @@ as users do not always mention that they are talking about the server!<p><hr>

The ServerAlias directive sets the alternate names for a host, for use
with
<a href="../host.html">Host-header based virtual hosts</a>.
<p><strong>See Also</strong>:
<a href="../vhosts-in-depth.html">In-depth description of Virtual Host matching</a></p>
<a href="../vhosts/name-based.html">name-based virtual hosts</a>.

<p><strong>See also:</strong>
<a href="../vhosts/index.html">Apache Virtual Host documentation</a>

<hr>

@@ -1522,9 +1552,11 @@ were <code>monster.wibble.com</code>.<p>
1.1 and later.<p>

The ServerPath directive sets the legacy URL pathname for a host, for
use with <a href="../host.html">Host-header based virtual hosts</a>.
<p><strong>See Also</strong>:
<a href="../vhosts-in-depth.html">In-depth description of Virtual Host matching</a></p>
use with <a href="../vhosts/index.html">name-based virtual hosts</a>.

<p><strong>See also:</strong>
<a href="../vhosts/index.html">Apache Virtual Host documentation</a>

<hr>

<h2><A name="serverroot">ServerRoot directive</A></h2>
@@ -1742,14 +1774,9 @@ either <a href="#bindaddress">BindAddress</a> or <a
href="#listen">Listen</a>.

<p><strong>See also:</strong>
<A HREF="../dns-caveats.html">Warnings about DNS and Apache</a><br>
<strong>See also:</strong>
<A HREF="../virtual-host.html">Information on Virtual Hosts.
(multihome)</A><br>
<a href="../vhosts/index.html">Apache Virtual Host documentation</a><br>
<strong>See also:</strong>
<a href="../host.html">Non-IP address-based Virtual Hosts</a><br>
<strong>See also:</strong>
<a href="../vhosts-in-depth.html">In-depth description of Virtual Host matching</a><br>
<A HREF="../dns-caveats.html">Warnings about DNS and Apache</a><br>
<strong>See also:</strong>
<a href="../bind.html">Setting which addresses and ports Apache uses</a><br>
<strong>See also</strong>: <a href="../sections.html">How Directory,
Loading