Autogenerated HTML docs for v1.4.2.1-g2d5b

1 files changed, 46 insertions, 7 deletions

diff --git a/git-daemon.html b/git-daemon.html
index d2ff3cabf..0002d8a2f 100644
--- a/git-daemon.html
+++ b/git-daemon.html
@@ -273,14 +273,15 @@ git-daemon(1) Manual Page
 <h2>SYNOPSIS</h2>

 <div class="sectionbody">

 <div class="verseblock">

-<div class="content"><em>git-daemon</em> [--verbose] [--syslog] [--inetd | --port=n] [--export-all]

+<div class="content"><em>git-daemon</em> [--verbose] [--syslog] [--export-all]

              [--timeout=n] [--init-timeout=n] [--strict-paths]

              [--base-path=path] [--user-path | --user-path=path]

              [--interpolated-path=pathtemplate]

+             [--reuseaddr] [--detach] [--pid-file=file]

              [--enable=service] [--disable=service]

              [--allow-override=service] [--forbid-override=service]

-             [--reuseaddr] [--detach] [--pid-file=file]

-             [--user=user [--group=group]] [directory&#8230;]</div></div>

+             [--inetd | [--listen=host_or_ipaddr] [--port=n] [--user=user [--group=group]]

+             [directory&#8230;]</div></div>

 </div>

 <h2>DESCRIPTION</h2>

 <div class="sectionbody">

@@ -331,8 +332,12 @@ git repositories.</p>
 <p>

         To support virtual hosting, an interpolated path template can be

         used to dynamically construct alternate paths.  The template

-        supports %H for the target hostname as supplied by the client,

+        supports %H for the target hostname as supplied by the client but

+        converted to all lowercase, %CH for the canonical hostname,

+        %IP for the server's IP address, %P for the port number,

         and %D for the absolute path of the named repository.

+        After interpolation, the path is validated against the directory

+        whitelist.

 </p>

 </dd>

 <dt>

@@ -351,14 +356,27 @@ git repositories.</p>
 <dd>

 <p>

         Have the server run as an inetd service. Implies --syslog.

+        Incompatible with --port, --listen, --user and --group options.

 </p>

 </dd>

 <dt>

---port

+--listen=host_or_ipaddr

 </dt>

 <dd>

 <p>

-        Listen on an alternative port.

+        Listen on an a specific IP address or hostname.  IP addresses can

+        be either an IPv4 address or an IPV6 address if supported.  If IPv6

+        is not supported, then --listen=hostname is also not supported and

+        --listen must be given an IPv4 address.

+        Incompatible with <em>--inetd</em> option.

+</p>

+</dd>

+<dt>

+--port=n

+</dt>

+<dd>

+<p>

+        Listen on an alternative port.  Incompatible with <em>--inetd</em> option.

 </p>

 </dd>

 <dt>

@@ -551,6 +569,27 @@ Further, both hosts advertise repositories simply as
 clients, a symlink from <tt>/software</tt> into the appropriate

 default repository could be made as well.</p>

 </dd>

+<dt>

+git-daemon as regular daemon for virtual hosts

+</dt>

+<dd>

+<p>

+        To set up <tt>git-daemon</tt> as a regular, non-inetd service that

+        handles repositories for multiple virtual hosts based on

+        their IP addresses, start the daemon like this:

+</p>

+<div class="listingblock">

+<div class="content">

+<pre><tt>        git-daemon --verbose --export-all

+                --interpolated-path=/pub/%IP/%D

+                /pub/192.168.1.200/software

+                /pub/10.10.220.23/software</tt></pre>

+</div></div>

+<p>In this example, the root-level directory <tt>/pub</tt> will contain

+a subdirectory for each virtual host IP address supported.

+Repositories can still be accessed by hostname though, assuming

+they correspond to these IP addresses.</p>

+</dd>

 </dl>

 </div>

 <h2>Author</h2>

@@ -568,7 +607,7 @@ default repository could be made as well.</p>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 25-Sep-2006 04:45:33 UTC

+Last updated 28-Sep-2006 07:39:09 UTC

 </div>

 </div>

 </body>