From 040c413181aa15f8d2ed7ab72fa56713810cb549 Mon Sep 17 00:00:00 2001
From: Stefan Ritt <stefan.ritt@psi.ch>
Date: Fri, 7 Mar 2003 08:58:18 +0000
Subject: [PATCH] Mention URL for stunnel etc

SVN revision: 432
---
 doc/adminguide.html | 16 +++++++++++++++-
 doc/config.html     | 24 +++++++++++++++++-------
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/doc/adminguide.html b/doc/adminguide.html
index de881ffc..11ae4740 100755
--- a/doc/adminguide.html
+++ b/doc/adminguide.html
@@ -146,11 +146,23 @@ ProxyPass /elog/ http://your.host.domain:8080/
 Make sure that the Apache modules mod_proxy.c and mod_alias.c are activated. The <i>Redirect</i>
 statement is necessary to automatically append a "/" to a request like <code><b>
 http://your.host.domain/elog</code></b>. Apache then works as a proxy and forwards all requests
-starint with <code><b>/elog</b></code> to the elogd daemon.<p>
+staring with <code><b>/elog</b></code> to the elogd daemon.<p>
+
+Because <code><b>elogd</b></code> uses links to itself (for example in the email notification and
+the redirection after a submit), it has to know under which URL it is running. If you run it
+under a proxy, you have to add the line:<br>
+
+<ul><pre>
+URL = http://your.proxy.host/subdir/
+</pre></ul><p>
+
+into elogd.cfg.<p>
 
 Note that the variable $remote_host cannot be used inside elogd since the remote host is always
 the proxy host (anybody knows how to fix that???).<p>
 
+
+
 <h3><hr><i>Notes for the Solaris platform</i>:</h3>
 
 <p><a href="mailto:huber@secaron.de">Martin Huber</a> reports that
@@ -287,6 +299,8 @@ on port 80, use a different port.
     Substitute the port 80 if you started <code><b>elogd</b></code> on another port. This
     causes <b><code>stunnel</code></b> to receive requests on the https port 443 and         forward them to the <code><b>elogd</b></code> port.
 <P>
+<LI>Put the URL under which <code><b>elogd</b></code> runs into elogd.cfg:<p>
+    <pre>URL = https://your.host.name/</pre>
 <LI>Connect to your logbook with a browser which supports SSL via:
 <P>
     <pre>https://your.host.name/</pre>
diff --git a/doc/config.html b/doc/config.html
index b6f6ffe3..4be984da 100755
--- a/doc/config.html
+++ b/doc/config.html
@@ -189,15 +189,25 @@ name you can get from your email program or your local system administrator.
 This option specifies a filename which logs all login/logout activities and
 successful user connections for logbooks with user level access.<p>
 
-<LI><b><code>URL = &lt;http://host.domain&gt;</code></b>
+<LI><b><code>URL = &lt;http[s]://host.domain[:port]/[subdir/]&gt;</code></b>
 <br>
-This URL is used in automatic email notifications to point back to the new message.
-Usually, the elog daemon tries to obtain the URL from the "Referer" statement in the
-HTTP header. If this is not correct (like if the domain name is missing), the URL used
-to point back to the logbook can be overwritten by this statement. The URL has to
-contain the port number if not the standard port 80 is used like<br>
+If one of the three cases is true:<P>
+<UL>
+<LI><code><b>elogd</b></code> runs with <i>stunnel</i>
+<LI><code><b>elogd</b></code> runs under a proxy
+<LI>The automatic email notifications contains the wrong URL
+</UL><p>
+
+then the URL under which <code><b>elogd</b></code> is running has to be specified
+manually with this statement. The URL has to
+contain the port number if not the standard port 80 is used, it has to specify <i>https://</i>
+if used under <i>stunnel</i>, and it has to contain the directory if used under a proxy like<br>
 <br>
-<code>URL = http://host.domain:8080/</code>
+<table border=0 cellpadding=10>
+<tr><td><code>URL = http://host.domain:8080/</code>   <td>if running on port 8080</tr>
+<tr><td><code>URL = https://host.domain/</code>       <td>if running under <i>stunnel</i></tr>
+<tr><td><code>URL = http://host.domain/subdir/</code> <td>if running under a proxy</tr>
+</table>
 <p>
 
 <LI><b><code>Usr = &lt;name&gt;</code></b>