Browse Source

rework response returned by dojo.sh onion

use-env-var-docker
kenshin-samourai 4 years ago
parent
commit
afd59d1f50
  1. 24
      docker/my-dojo/dojo.sh

24
docker/my-dojo/dojo.sh

@ -57,7 +57,7 @@ docker_up() {
yamlFiles=$(select_yaml_files) yamlFiles=$(select_yaml_files)
eval "docker-compose $yamlFiles up $1 -d" eval "docker-compose $yamlFiles up $1 -d"
} }
# Start # Start
start() { start() {
# Check if dojo is running (check the db container) # Check if dojo is running (check the db container)
@ -256,7 +256,7 @@ uninstall() {
del_images_for() { del_images_for() {
# $1: image name # $1: image name
# $2: most recent version of the image (do not delete this one) # $2: most recent version of the image (do not delete this one)
docker image ls | grep "$1" | sed "s/ \+/,/g" | cut -d"," -f2 | while read -r version ; do docker image ls | grep "$1" | sed "s/ \+/,/g" | cut -d"," -f2 | while read -r version ; do
if [ "$2" != "$version" ]; then if [ "$2" != "$version" ]; then
docker image rm "$1:$version" docker image rm "$1:$version"
fi fi
@ -337,22 +337,26 @@ upgrade() {
# Display the onion address # Display the onion address
onion() { onion() {
echo " "
echo "WARNING: Do not share these onion addresses with anyone! To allow another person to use this Dojo with her Samourai Wallet, you should share the QRCodes provided by the Maintenance Tool."
echo " "
V3_ADDR=$( docker exec -it tor cat /var/lib/tor/hsv3dojo/hostname )
echo "Dojo API and Maintenance Tool = $V3_ADDR"
if [ "$EXPLORER_INSTALL" == "on" ]; then if [ "$EXPLORER_INSTALL" == "on" ]; then
V3_ADDR_EXPLORER=$( docker exec -it tor cat /var/lib/tor/hsv3explorer/hostname ) V3_ADDR_EXPLORER=$( docker exec -it tor cat /var/lib/tor/hsv3explorer/hostname )
echo "Explorer hidden service address = $V3_ADDR_EXPLORER" echo "Block Explorer = $V3_ADDR_EXPLORER"
fi fi
V3_ADDR=$( docker exec -it tor cat /var/lib/tor/hsv3dojo/hostname )
echo "Maintenance Tool hidden service address = $V3_ADDR"
if [ "$WHIRLPOOL_INSTALL" == "on" ]; then if [ "$WHIRLPOOL_INSTALL" == "on" ]; then
V3_ADDR_WHIRLPOOL=$( docker exec -it tor cat /var/lib/tor/hsv3whirlpool/hostname ) V3_ADDR_WHIRLPOOL=$( docker exec -it tor cat /var/lib/tor/hsv3whirlpool/hostname )
echo "Whirlpool API hidden service address = $V3_ADDR_WHIRLPOOL" echo "Your personal Whirlpool client running on this Dojo (do not share) = $V3_ADDR_WHIRLPOOL"
fi fi
if [ "$BITCOIND_INSTALL" == "on" ]; then if [ "$BITCOIND_INSTALL" == "on" ]; then
V2_ADDR_BTCD=$( docker exec -it tor cat /var/lib/tor/hsv2bitcoind/hostname ) V2_ADDR_BTCD=$( docker exec -it tor cat /var/lib/tor/hsv2bitcoind/hostname )
echo "bitcoind hidden service address = $V2_ADDR_BTCD" echo "Your local bitcoind (do not share) = $V2_ADDR_BTCD"
fi fi
} }
@ -391,7 +395,7 @@ display_logs() {
docker-compose $yamlFiles logs --tail=50 --follow $1 docker-compose $yamlFiles logs --tail=50 --follow $1
else else
docker-compose $yamlFiles logs --tail=$2 $1 docker-compose $yamlFiles logs --tail=$2 $1
fi fi
} }
logs() { logs() {
@ -434,7 +438,7 @@ logs() {
fi fi
;; ;;
* ) * )
services="nginx node tor db" services="nginx node tor db"
if [ "$BITCOIND_INSTALL" == "on" ]; then if [ "$BITCOIND_INSTALL" == "on" ]; then
services="$services bitcoind" services="$services bitcoind"
fi fi

Loading…
Cancel
Save