From b18510a7e3eb58cc0708a4dc403442f6f324f226 Mon Sep 17 00:00:00 2001 From: Saibato Date: Fri, 15 Nov 2019 09:47:21 +0100 Subject: [PATCH] Reflect the changes in documentation Signed-off-by: Saibato --- doc/lightningd-config.5 | 15 ++++++++++++++- doc/lightningd-config.5.md | 15 ++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/doc/lightningd-config.5 b/doc/lightningd-config.5 index 6f1ffbed6..d18624951 100644 --- a/doc/lightningd-config.5 +++ b/doc/lightningd-config.5 @@ -337,7 +337,8 @@ precisely control where to bind and what to announce with the \fIautolisten\fR logic, so you must specifiy exactly what you want! - \fBaddr\fR=\fI[IPADDRESS[:PORT]]|autotor:TORIPADDRESS[:TORPORT]\fR + \fBaddr\fR=\fI[IPADDRESS\[:PORT\]\]|autotor:TORIPADDRESS\[:SERVICEPORT\]\[/torport=TORPORT\]|statictor:TORIPADDRESS\[:SERVICEPORT\]\[/torport=TORPORT\]\[/torblob=\[blob\]\]\fR + Set an IP address (v4 or v6) or automatic Tor address to listen on and (maybe) announce as our node address\. @@ -356,6 +357,18 @@ and this will be used to configure a Tor hidden service for port 9735. The Tor hidden service will be configured to point to the first IPv4 or IPv6 address we bind to. +If the argument begins with 'statictor:' then it is followed by the +IPv4 or IPv6 address of the Tor control port (default port 9051), +and this will be used to configure a static Tor hidden service for port +9735. The Tor hidden service will be configured to point to the +first IPv4 or IPv6 address we bind to and is by default unique to +your nodes id. You can add the text '/torblob=BLOB' followed by up to +64 Bytes of text to generate from this text a v3 onion service +address text unique to the first 32 Byte of this text. +You can also use an postfix '/torport=TORPORT' to select the external +tor binding. The result is that over tor your node is accessible by a port +defined by you and possible different from your local node port assignment + This option can be used multiple times to add more addresses, and its use disables autolisten. If necessary, and 'always-use-proxy' is not specified, a DNS lookup may be done to resolve 'IPADDRESS' diff --git a/doc/lightningd-config.5.md b/doc/lightningd-config.5.md index 324fcbd35..046526eab 100644 --- a/doc/lightningd-config.5.md +++ b/doc/lightningd-config.5.md @@ -276,7 +276,8 @@ precisely control where to bind and what to announce with the *bind-addr* and *announce-addr* options. These will **disable** the *autolisten* logic, so you must specifiy exactly what you want! - **addr**=*\[IPADDRESS\[:PORT\]\]|autotor:TORIPADDRESS\[:TORPORT\]* + **addr**=*\[IPADDRESS\[:PORT\]\]|autotor:TORIPADDRESS\[:SERVICEPORT\]\[/torport=TORPORT\]|statictor:TORIPADDRESS\[:SERVICEPORT\]\[/torport=TORPORT\]\[/torblob=\[blob\]\]* + Set an IP address (v4 or v6) or automatic Tor address to listen on and (maybe) announce as our node address. @@ -293,6 +294,18 @@ Set an IP address (v4 or v6) or automatic Tor address to listen on and 9735. The Tor hidden service will be configured to point to the first IPv4 or IPv6 address we bind to. + If the argument begins with 'statictor:' then it is followed by the + IPv4 or IPv6 address of the Tor control port (default port 9051), + and this will be used to configure a static Tor hidden service for port + 9735. The Tor hidden service will be configured to point to the + first IPv4 or IPv6 address we bind to and is by default unique to + your nodes id. You can add the text '/torblob=BLOB' followed by up to + 64 Bytes of text to generate from this text a v3 onion service + address text unique to the first 32 Byte of this text. + You can also use an postfix '/torport=TORPORT' to select the external + tor binding. The result is that over tor your node is accessible by a port + defined by you and possible different from your local node port assignment + This option can be used multiple times to add more addresses, and its use disables autolisten. If necessary, and 'always-use-proxy' is not specified, a DNS lookup may be done to resolve 'IPADDRESS'