From: Daira Hopwood Date: Tue, 10 Feb 2015 18:23:59 +0000 (+0000) Subject: Documentation change for AUTO in tub.location. refs #754 X-Git-Tag: allmydata-tahoe-1.10.1a1~70^2 X-Git-Url: https://git.rkrishnan.org/simplejson/components/flags//%22%3C?a=commitdiff_plain;h=1b83f7854c473ffe5d7b6d687e4eaada21f55893;p=tahoe-lafs%2Ftahoe-lafs.git Documentation change for AUTO in tub.location. refs #754 Signed-off-by: Daira Hopwood --- diff --git a/docs/configuration.rst b/docs/configuration.rst index 26d8c58b..ac75cca7 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -4,7 +4,7 @@ Configuring a Tahoe-LAFS node ============================= -1. `Node Types`_ +1. `Node Types`_ 2. `Overall Node Configuration`_ 3. `Client Configuration`_ 4. `Storage Server Configuration`_ @@ -159,6 +159,11 @@ set the ``tub.location`` option described below. this when using a Tor proxy to avoid revealing your actual IP address through the Introducer announcement. + If ``tub.location`` is specified, by default it entirely replaces the + automatically determined set of IP addresses. To include the automatically + determined addresses as well as the specified ones, include the uppercase + string "``AUTO``" in the list. + The value is a comma-separated string of host:port location hints, like this:: @@ -177,6 +182,11 @@ set the ``tub.location`` option described below. tub.port = 8098 tub.location = tahoe.example.com:8098 + * Use a DNS name but also include the default set of addresses:: + + tub.port = 8098 + tub.location = tahoe.example.com:8098,AUTO + * Run a node behind a firewall (which has an external IP address) that has been configured to forward port 7912 to our internal node's port 8098::