From: david-sarah <david-sarah@jacaranda.org>
Date: Thu, 17 Jun 2010 00:45:13 +0000 (-0700)
Subject: Remove firewall section from running.html and say to read configuration.txt instead.
X-Git-Tag: trac-4500
X-Git-Url: https://git.rkrishnan.org/pf/provisioning?a=commitdiff_plain;h=1c7e71ee52caaf00170264670253617dc2319579;p=tahoe-lafs%2Ftahoe-lafs.git

Remove firewall section from running.html and say to read configuration.txt instead.
---

diff --git a/docs/configuration.txt b/docs/configuration.txt
index 1ab7ebf6..5428252a 100644
--- a/docs/configuration.txt
+++ b/docs/configuration.txt
@@ -38,6 +38,12 @@ and IP addresses are used, when connections are timed out, etc. This
 configuration is independent of the services that the node is offering: the
 same controls are used for client and introducer nodes.
 
+If your node is behind a firewall or NAT device and you want other clients to
+connect to it, you'll need to open a port in the firewall or NAT, and specify
+that port number in the tub.port option. If behind a NAT, you *may* need to
+set the tub.location option described below.
+
+
 [node]
 
 nickname = (UTF-8 string, optional)
diff --git a/docs/running.html b/docs/running.html
index a274c0b8..0e6b7b78 100644
--- a/docs/running.html
+++ b/docs/running.html
@@ -61,38 +61,10 @@
 
 
     <p>See <a href="configuration.txt">configuration.txt</a> for more
-    details about how to configure Tahoe-LAFS.</p>
+    details about how to configure Tahoe-LAFS, including how to get other
+    clients to connect to your node if it is behind a firewall or NAT device.
 
 
-    <h2>A note about firewalls</h2>
-
-    <p>If your node is behind a firewall or NAT device and you want other
-    clients to connect to it then you'll need to <em>open a port</em> in your
-    firewall.  To do that you'll need to know which port Tahoe-LAFS is listening on.
-    If you haven't already set a port number, it will pick a random port to
-    listen on and remember this port number in the
-    <code>~/.tahoe/client.port</code> file.  To tell Tahoe-LAFS to listen to a fixed
-    port, open the <code>~/.tahoe/tahoe.cfg</code> file in your favourite text
-    editor and changing the <code>tub.port</code> line to something like the
-    following:</p>
-
-    <pre>tub.port = 8098</pre>
-
-    <p>This tells Tahoe-LAFS to always listen on port 8098 of your
-    computer.  The next issue is that your computer may be behind a
-    NATing router and isn't directly connected to the internet but
-    goes through a router to get out.  If that's the case then you'll
-    need to set the <code>tub.location</code> option so that Tahoe-LAFS
-    tells the introducer where you're really listening:</p>
-
-    <pre>tub.location = myserver.mydomain.org:8098</pre>
-
-    <p>or probably more likely</p>
-
-    <pre>tub.location = 123.456.789.012:8098</pre>
-
-    <p>The <a href="configuration.txt">configuration.txt</a> file contains more details.</p>
-
     <h2>A note about small grids</h2>
 
     <p>By default, Tahoe-LAFS ships with the configuration parameter