Commit b7090862 authored by likewhoa's avatar likewhoa
Browse files

Merge branch 'feat_onionv2_removal' into 'development'

Feat onionv2 removal

See merge request !163
parents eaf1594f 438b21e1
...@@ -41,7 +41,6 @@ WARNING: Do not share these onion addresses with anyone! ...@@ -41,7 +41,6 @@ WARNING: Do not share these onion addresses with anyone!
${nc} ${nc}
Maintenance Tool: Maintenance Tool:
Tor V2 URL = http://${v2_addr_dojo_api}/admin
Tor V3 URL = http://${v3_addr_dojo_api}/admin Tor V3 URL = http://${v3_addr_dojo_api}/admin
Admin Key = $NODE_ADMIN_KEY Admin Key = $NODE_ADMIN_KEY
API Key = $NODE_API_KEY API Key = $NODE_API_KEY
...@@ -65,7 +64,6 @@ WARNING: Do not share these onion addresses with anyone! ...@@ -65,7 +64,6 @@ WARNING: Do not share these onion addresses with anyone!
*** ***
${nc} ${nc}
Tor V2 URL = http://${v2_addr_whirlpool}
Tor V3 URL = http://${v3_addr_whirlpool} Tor V3 URL = http://${v3_addr_whirlpool}
Whirlpool API Key = ${whirlpool_api_key:-Whirlpool not Initiated yet. Pair wallet with GUI} Whirlpool API Key = ${whirlpool_api_key:-Whirlpool not Initiated yet. Pair wallet with GUI}
EOF EOF
...@@ -169,7 +167,6 @@ ${nc} ...@@ -169,7 +167,6 @@ ${nc}
Bitcoin Daemon: Bitcoin Daemon:
Tor V2 URL = http://${v2_addr_bitcoind}
Tor V3 URL = http://${v3_addr_bitcoind} Tor V3 URL = http://${v3_addr_bitcoind}
RPC User = $BITCOIND_RPC_USER RPC User = $BITCOIND_RPC_USER
RPC Password = $BITCOIND_RPC_PASSWORD RPC Password = $BITCOIND_RPC_PASSWORD
...@@ -177,7 +174,6 @@ RPC IP = $BITCOIND_IP ...@@ -177,7 +174,6 @@ RPC IP = $BITCOIND_IP
RPC Port = $BITCOIND_RPC_PORT RPC Port = $BITCOIND_RPC_PORT
Bitcoin RPC Explorer (No username required): Bitcoin RPC Explorer (No username required):
Tor V2 URL = http://${v2_addr_explorer}
Tor V3 URL = http://${v3_addr_explorer} Tor V3 URL = http://${v3_addr_explorer}
Password = $EXPLORER_KEY Password = $EXPLORER_KEY
EOF EOF
...@@ -252,7 +248,6 @@ WARNING: Do not share these onion addresses with anyone! ...@@ -252,7 +248,6 @@ WARNING: Do not share these onion addresses with anyone!
${nc} ${nc}
Maintenance Tool: Maintenance Tool:
Tor V2 URL = http://${v2_addr_dojo_api}/admin
Tor V3 URL = http://${v3_addr_dojo_api}/admin Tor V3 URL = http://${v3_addr_dojo_api}/admin
Admin Key = $NODE_ADMIN_KEY Admin Key = $NODE_ADMIN_KEY
API Key = $NODE_API_KEY API Key = $NODE_API_KEY
...@@ -267,7 +262,6 @@ WARNING: Do not share these onion addresses with anyone! ...@@ -267,7 +262,6 @@ WARNING: Do not share these onion addresses with anyone!
*** ***
${nc} ${nc}
Tor V2 URL = http://${v2_addr_whirlpool}
Tor V3 URL = http://${v3_addr_whirlpool} Tor V3 URL = http://${v3_addr_whirlpool}
Whirlpool API Key = ${whirlpool_api_key:-Whirlpool not Initiated yet. Pair wallet with GUI} Whirlpool API Key = ${whirlpool_api_key:-Whirlpool not Initiated yet. Pair wallet with GUI}
...@@ -289,7 +283,6 @@ ${nc} ...@@ -289,7 +283,6 @@ ${nc}
Bitcoin Daemon: Bitcoin Daemon:
Tor V2 URL = http://${v2_addr_bitcoind}
Tor V3 URL = http://${v3_addr_bitcoind} Tor V3 URL = http://${v3_addr_bitcoind}
RPC User = $BITCOIND_RPC_USER RPC User = $BITCOIND_RPC_USER
RPC Password = $BITCOIND_RPC_PASSWORD RPC Password = $BITCOIND_RPC_PASSWORD
...@@ -297,7 +290,6 @@ RPC IP = $BITCOIND_IP ...@@ -297,7 +290,6 @@ RPC IP = $BITCOIND_IP
RPC Port = $BITCOIND_RPC_PORT RPC Port = $BITCOIND_RPC_PORT
Bitcoin RPC Explorer (No username required): Bitcoin RPC Explorer (No username required):
Tor V2 URL = http://${v2_addr_explorer}
Tor V3 URL = http://${v3_addr_explorer} Tor V3 URL = http://${v3_addr_explorer}
Password = $EXPLORER_KEY Password = $EXPLORER_KEY
EOF EOF
......
...@@ -24,28 +24,16 @@ if sudo test -d "${docker_volume_tor}"/_data/hsv3bitcoind; then ...@@ -24,28 +24,16 @@ if sudo test -d "${docker_volume_tor}"/_data/hsv3bitcoind; then
v3_addr_bitcoind=$(sudo cat "${docker_volume_tor}"/_data/hsv3bitcoind/hostname) v3_addr_bitcoind=$(sudo cat "${docker_volume_tor}"/_data/hsv3bitcoind/hostname)
fi fi
if sudo test -d "${docker_volume_tor}"/_data/hsv2bitcoind; then
v2_addr_bitcoind=$(sudo cat "${docker_volume_tor}"/_data/hsv2bitcoind/hostname)
fi
# Bitcoin Explorer # Bitcoin Explorer
if sudo test -d "${docker_volume_tor}"/_data/hsv3explorer; then if sudo test -d "${docker_volume_tor}"/_data/hsv3explorer; then
v3_addr_explorer=$(sudo cat "${docker_volume_tor}"/_data/hsv3explorer/hostname) v3_addr_explorer=$(sudo cat "${docker_volume_tor}"/_data/hsv3explorer/hostname)
fi fi
if sudo test -d "${docker_volume_tor}"/_data/hsv2explorer; then
v2_addr_explorer=$(sudo cat "${docker_volume_tor}"/_data/hsv2explorer/hostname)
fi
# Dojo Maintanance Tool # Dojo Maintanance Tool
if sudo test -d "${docker_volume_tor}"/_data/hsv3dojo; then if sudo test -d "${docker_volume_tor}"/_data/hsv3dojo; then
v3_addr_dojo_api=$(sudo cat "${docker_volume_tor}"/_data/hsv3dojo/hostname) v3_addr_dojo_api=$(sudo cat "${docker_volume_tor}"/_data/hsv3dojo/hostname)
fi fi
if sudo test -d "${docker_volume_tor}"/_data/hsv2dojo; then
v2_addr_dojo_api=$(sudo cat "${docker_volume_tor}"/_data/hsv2dojo/hostname)
fi
# Electrum Server # Electrum Server
if sudo test -d "${docker_volume_tor}"/_data/hsv3electrs; then if sudo test -d "${docker_volume_tor}"/_data/hsv3electrs; then
v3_addr_electrs=$(sudo cat "${docker_volume_tor}"/_data/hsv3electrs/hostname) v3_addr_electrs=$(sudo cat "${docker_volume_tor}"/_data/hsv3electrs/hostname)
...@@ -56,10 +44,6 @@ if sudo test -d "${docker_volume_tor}"/_data/hsv3whirlpool; then ...@@ -56,10 +44,6 @@ if sudo test -d "${docker_volume_tor}"/_data/hsv3whirlpool; then
v3_addr_whirlpool=$(sudo cat "${docker_volume_tor}"/_data/hsv3whirlpool/hostname) v3_addr_whirlpool=$(sudo cat "${docker_volume_tor}"/_data/hsv3whirlpool/hostname)
fi fi
if sudo test -d "${docker_volume_tor}"/_data/hsv2whirlpool; then
v2_addr_whirlpool=$(sudo cat "${docker_volume_tor}"/_data/hsv2whirlpool/hostname)
fi
# Mempool Space Visualizer # Mempool Space Visualizer
if sudo test -d "${docker_volume_tor}"/_data/hsv3mempool; then if sudo test -d "${docker_volume_tor}"/_data/hsv3mempool; then
v3_addr_mempool=$(sudo cat "${docker_volume_tor}"/_data/hsv3mempool/hostname) v3_addr_mempool=$(sudo cat "${docker_volume_tor}"/_data/hsv3mempool/hostname)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment