Browse Source

Merge JoinMarket-Org/joinmarket-clientserver#1224: docs: Add required port for directory_nodes in doc

704ffcfb7e docs: Add required port for directory_nodes in doc (laanwj)

Pull request description:

  `:80` needs to be provided otherwise parsing will fail with

      Failed to load directory nodes: InvalidLocationStringError('3kxw6lf5vf6y26emzwgibzhrzhmhqiw6ekrek3nqfjjmhwznb2moonad.onion')

  This is correct in the auto-generated configuration file, but not in the document.

  Also mention that even for UNIX sockets, it's necessary to specify `tor_control_port`.

ACKs for top commit:
  kristapsk:
    ACK 704ffcfb7e. Checked that doc changes describes current reality.

Tree-SHA512: 32c41e0e0136c7d84f6fe988befbbf3e0ebcae0fa5f5d790c32c73e06c0b47296cfdacbb97fba4479c84c69bda436fa7382d01fb70dbfd1a00cf9d9c0653f6de
master
Kristaps Kaupe 4 years ago
parent
commit
22ccb1b9c7
No known key found for this signature in database
GPG Key ID: 33E472FE870C7E5D
  1. 3
      docs/onion-message-channels.md
  2. 2
      jmclient/jmclient/configure.py

3
docs/onion-message-channels.md

@ -46,6 +46,7 @@ socks5_port = 9050
tor_control_host = localhost
# or, to use a UNIX socket
# tor_control_host = unix:/var/run/tor/control
# note: port needs to be provided (but is ignored for UNIX socket)
tor_control_port = 9051
# the host/port actually serving the hidden service
@ -67,7 +68,7 @@ hidden_service_dir =
# Each item has format host:port ; both are required, though port will
# be 80 if created in this code.
# for MAINNET:
directory_nodes = 3kxw6lf5vf6y26emzwgibzhrzhmhqiw6ekrek3nqfjjmhwznb2moonad.onion,qqd22cwgygaxcy6vdw6mzwkyaxg5urb4ptbc5d74nrj25phspajxjbqd.onion
directory_nodes = 3kxw6lf5vf6y26emzwgibzhrzhmhqiw6ekrek3nqfjjmhwznb2moonad.onion:80,qqd22cwgygaxcy6vdw6mzwkyaxg5urb4ptbc5d74nrj25phspajxjbqd.onion:80
# for SIGNET (testing network):
# directory_nodes = rr6f6qtleiiwic45bby4zwmiwjrj3jsbmcvutwpqxjziaydjydkk5iad.onion:80,k74oyetjqgcamsyhlym2vgbjtvhcrbxr4iowd4nv4zk5sehw4v665jad.onion:80

2
jmclient/jmclient/configure.py

@ -157,6 +157,7 @@ socks5_port = 9050
tor_control_host = localhost
# or, to use a UNIX socket
# tor_control_host = unix:/var/run/tor/control
# note: port needs to be provided (but is ignored for UNIX socket)
tor_control_port = 9051
# the host/port actually serving the hidden service
@ -464,6 +465,7 @@ tor_control_host = localhost
# or, to use a UNIX socket
# control_host = unix:/var/run/tor/control
# note: port needs to be provided (but is ignored for UNIX socket)
tor_control_port = 9051
# the host/port actually serving the hidden service

Loading…
Cancel
Save