Browse Source

Merge JoinMarket-Org/joinmarket-clientserver#1211: Remove agora from default IRC configuration

68fe12b258 reorder IRC server config (unofficial bisq contributor)
c07fcfceea remove agora from configure (unofficial bisq contributor)
4f1571b573 Update config-irc-update.md (unofficial bisq contributor)

Pull request description:

  Since Agora is offline ?

Top commit has no ACKs.

Tree-SHA512: 2cf012525d026679659f689b0cb8a141438c37d0a317829f6acd1c2103b2c4f66c8d5b5c9e8696d67271f4d281437952c2207def75590ba057a547d83729b7ce
master
Kristaps Kaupe 4 years ago
parent
commit
aabfd3f7c2
No known key found for this signature in database
GPG Key ID: 33E472FE870C7E5D
  1. 15
      docs/config-irc-update.md
  2. 27
      jmclient/jmclient/configure.py

15
docs/config-irc-update.md

@ -42,21 +42,6 @@ new config:
#usessl = true #usessl = true
#socks5 = true #socks5 = true
[MESSAGING:server2]
host = agora.anarplex.net
channel = joinmarket-pit
port = 14716
usessl = true
socks5 = false
socks5_host = localhost
socks5_port = 9050
#for tor
#host = vxecvd6lc4giwtasjhgbrr3eop6pzq6i5rveracktioneunalgqlwfad.onion
#port = 6667
#usessl = false
#socks5 = true
[MESSAGING:exampleserver] [MESSAGING:exampleserver]
host = another.irc.server.example.com host = another.irc.server.example.com
channel = joinmarket-pit channel = joinmarket-pit

27
jmclient/jmclient/configure.py

@ -137,7 +137,7 @@ rpc_password = password
# information. # information.
rpc_wallet_file = rpc_wallet_file =
## SERVER 1/4) Darkscience IRC (Tor, IP) ## SERVER 1/3) Darkscience IRC (Tor, IP)
################################################################################ ################################################################################
[MESSAGING:server1] [MESSAGING:server1]
channel = joinmarket-pit channel = joinmarket-pit
@ -154,7 +154,7 @@ socks5 = false
#socks5_host = localhost #socks5_host = localhost
#socks5_port = 9050 #socks5_port = 9050
## SERVER 2/4) hackint IRC (Tor, IP) ## SERVER 2/3) hackint IRC (Tor, IP)
################################################################################ ################################################################################
[MESSAGING:server2] [MESSAGING:server2]
channel = joinmarket-pit channel = joinmarket-pit
@ -173,28 +173,9 @@ socks5 = false
#socks5_host = localhost #socks5_host = localhost
#socks5_port = 9050 #socks5_port = 9050
## SERVER 3/4) Anarplex IRC (Tor, IP) ## SERVER 3/3) ILITA IRC (Tor - disabled by default)
################################################################################ ################################################################################
[MESSAGING:server3] #[MESSAGING:server3]
channel = joinmarket-pit
# For traditional IP (default):
host = agora.anarplex.net
port = 14716
usessl = true
socks5 = false
# For Tor (recommended as clearnet alternative):
#host = vxecvd6lc4giwtasjhgbrr3eop6pzq6i5rveracktioneunalgqlwfad.onion
#port = 6667
#usessl = false
#socks5 = true
#socks5_host = localhost
#socks5_port = 9050
## SERVER 4/4) ILITA IRC (Tor - disabled by default)
################################################################################
#[MESSAGING:server4]
#channel = joinmarket-pit #channel = joinmarket-pit
#port = 6667 #port = 6667
#usessl = false #usessl = false

Loading…
Cancel
Save