[tor-commits] [meek/master] Use ServerTransportListenAddr instead of --port where possible.

[dcf at torproject.org]

commit 71caf085cba2b6fa2e7de597e379a2a67e26b16b
Author: David Fifield <david at bamsoftware.com>
Date:   Thu Mar 30 18:28:54 2017 -0700

    Use ServerTransportListenAddr instead of --port where possible.
---
 doc/meek-server.1.txt      | 10 +++++++---
 meek-server/meek-server.go |  6 ++++--
 meek-server/torrc          |  3 ++-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/doc/meek-server.1.txt b/doc/meek-server.1.txt
index 3ba6b5a..f079978 100644
--- a/doc/meek-server.1.txt
+++ b/doc/meek-server.1.txt
@@ -26,12 +26,14 @@ Configuration for meek-server usually appears in a torrc file. Here is a
 sample configuration using HTTPS:
 ----
 ExtORPort auto
-ServerTransportPlugin meek exec ./meek-server --port 8443 --cert cert.pem --key key.pem --log meek-server.log
+ServerTransportListenAddr meek 0.0.0.0:8443
+ServerTransportPlugin meek exec ./meek-server 8443 --cert cert.pem --key key.pem --log meek-server.log
 ----
 Here is a sample configuration using plain HTTP:
 ----
 ExtORPort auto
-ServerTransportPlugin meek exec ./meek-server --port 8080 --disable-tls --log meek-server.log
+ServerTransportListenAddr meek 0.0.0.0:8080
+ServerTransportPlugin meek exec ./meek-server --disable-tls --log meek-server.log
 ----
 
 OPTIONS
@@ -52,7 +54,9 @@ OPTIONS
 
 **--port**=__PORT__::
     Port to listen on. Overrides the TOR_PT_SERVER_BINDADDR environment
-    variable set by tor.
+    variable set by tor. In most cases you should set the
+    **ServerTransportListenAddr** option in torrc, rather than use the
+    **--port** option.
 
 **-h**, **--help**::
     Display a help message and exit.
diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go
index 7736615..bf0f8a4 100644
--- a/meek-server/meek-server.go
+++ b/meek-server/meek-server.go
@@ -3,9 +3,11 @@
 // data to a local OR port.
 //
 // Sample usage in torrc:
-// 	ServerTransportPlugin meek exec ./meek-server --port 8443 --cert cert.pem --key key.pem --log meek-server.log
+// 	ServerTransportListenAddr meek 0.0.0.0:8443
+// 	ServerTransportPlugin meek exec ./meek-server --cert cert.pem --key key.pem --log meek-server.log
 // Plain HTTP usage:
-// 	ServerTransportPlugin meek exec ./meek-server --port 8080 --disable-tls --log meek-server.log
+// 	ServerTransportListenAddr meek 0.0.0.0:8080
+// 	ServerTransportPlugin meek exec ./meek-server --disable-tls --log meek-server.log
 //
 // The server runs in HTTPS mode by default, and the --cert and --key options
 // are required. Use the --disable-tls option to run with plain HTTP.
diff --git a/meek-server/torrc b/meek-server/torrc
index db22794..613cb9c 100644
--- a/meek-server/torrc
+++ b/meek-server/torrc
@@ -2,5 +2,6 @@ BridgeRelay 1
 ORPort 9001
 ExtORPort auto
 SocksPort 0
-ServerTransportPlugin meek exec ./meek-server --log meek-server.log --port 7002 --cert cert.pem --key key.pem
+ServerTransportListenAddr meek 0.0.0.0:7002
+ServerTransportPlugin meek exec ./meek-server --log meek-server.log --cert cert.pem --key key.pem
 ExitPolicy reject *:*