Removed support for v2 hidden services

docker/my-dojo/bitcoin/restart.sh

@@ -32,7 +32,6 @@ bitcoind_options=(
 if [ "$BITCOIND_LISTEN_MODE" == "on" ]; then
   bitcoind_options+=(-listen=1)
   bitcoind_options+=(-bind="$NET_DOJO_BITCOIND_IPV4")
-  bitcoind_options+=(-externalip=$(cat /var/lib/tor/hsv2bitcoind/hostname))
   bitcoind_options+=(-externalip=$(cat /var/lib/tor/hsv3bitcoind/hostname))
 fi
 

docker/my-dojo/dojo.sh

@@ -85,7 +85,6 @@ stop() {
     # Renewal of bitcoind onion address
     if [ "$BITCOIND_LISTEN_MODE" == "on" ]; then
       if [ "$BITCOIND_EPHEMERAL_HS" = "on" ]; then
-        $( docker exec -it tor rm -rf /var/lib/tor/hsv2bitcoind ) &> /dev/null
         $( docker exec -it tor rm -rf /var/lib/tor/hsv3bitcoind ) &> /dev/null
       fi
     fi
@@ -355,77 +354,35 @@ upgrade() {
 
 # Display the onion addresses
 onion() {
-  version=3
-
-  # Extract version arguments
-  if [ $# -gt 0 ]; then
-    for option in $@
-    do
-      case "$option" in
-        v2 )     version=2 ;;
-        v3 )     version=3 ;;
-        * )      break ;;
-      esac
-    done
-  fi
-
   echo " "
   echo "WARNING: Do not share these onion addresses with anyone!"
   echo "         To allow another person to use this Dojo with their Samourai Wallet,"
   echo "         you should share the QRCodes provided by the Maintenance Tool."
   echo " "
 
-  if [ $version -eq 3 ]; then
-    # V3 onion addresses
-    V3_ADDR=$( docker exec -it tor cat /var/lib/tor/hsv3dojo/hostname )
-    echo "Dojo API and Maintenance Tool = $V3_ADDR"
-    echo " "
-
-    if [ "$EXPLORER_INSTALL" == "on" ]; then
-      V3_ADDR_EXPLORER=$( docker exec -it tor cat /var/lib/tor/hsv3explorer/hostname )
-      echo "Block Explorer = $V3_ADDR_EXPLORER"
-      echo " "
-    fi
-
-    if [ "$WHIRLPOOL_INSTALL" == "on" ]; then
-      V3_ADDR_WHIRLPOOL=$( docker exec -it tor cat /var/lib/tor/hsv3whirlpool/hostname )
-      echo "Your private Whirlpool client (do not share) = $V3_ADDR_WHIRLPOOL"
-      echo " "
-    fi
-
-    if [ "$BITCOIND_INSTALL" == "on" ]; then
-      if [ "$BITCOIND_LISTEN_MODE" == "on" ]; then
-        V3_ADDR_BTCD=$( docker exec -it tor cat /var/lib/tor/hsv3bitcoind/hostname )
-        echo "Your local bitcoind (do not share) = $V3_ADDR_BTCD"
-        echo " "
-      fi
-    fi
+  # V3 onion addresses
+  V3_ADDR=$( docker exec -it tor cat /var/lib/tor/hsv3dojo/hostname )
+  echo "Dojo API and Maintenance Tool = $V3_ADDR"
+  echo " "
 
-  else
-    # v2 onion addresses
-    V2_ADDR=$( docker exec -it tor cat /var/lib/tor/hsv2dojo/hostname )
-    echo "Dojo API and Maintenance Tool = $V2_ADDR"
+  if [ "$EXPLORER_INSTALL" == "on" ]; then
+    V3_ADDR_EXPLORER=$( docker exec -it tor cat /var/lib/tor/hsv3explorer/hostname )
+    echo "Block Explorer = $V3_ADDR_EXPLORER"
     echo " "
+  fi
 
-    if [ "$EXPLORER_INSTALL" == "on" ]; then
-      V2_ADDR_EXPLORER=$( docker exec -it tor cat /var/lib/tor/hsv2explorer/hostname )
-      echo "Block Explorer = $V2_ADDR_EXPLORER"
-      echo " "
-    fi
+  if [ "$WHIRLPOOL_INSTALL" == "on" ]; then
+    V3_ADDR_WHIRLPOOL=$( docker exec -it tor cat /var/lib/tor/hsv3whirlpool/hostname )
+    echo "Your private Whirlpool client (do not share) = $V3_ADDR_WHIRLPOOL"
+    echo " "
+  fi
 
-    if [ "$WHIRLPOOL_INSTALL" == "on" ]; then
-      V2_ADDR_WHIRLPOOL=$( docker exec -it tor cat /var/lib/tor/hsv2whirlpool/hostname )
-      echo "Your private Whirlpool client (do not share) = $V2_ADDR_WHIRLPOOL"
+  if [ "$BITCOIND_INSTALL" == "on" ]; then
+    if [ "$BITCOIND_LISTEN_MODE" == "on" ]; then
+      V3_ADDR_BTCD=$( docker exec -it tor cat /var/lib/tor/hsv3bitcoind/hostname )
+      echo "Your local bitcoind (do not share) = $V3_ADDR_BTCD"
       echo " "
     fi
-
-    if [ "$BITCOIND_INSTALL" == "on" ]; then
-      if [ "$BITCOIND_LISTEN_MODE" == "on" ]; then
-        V2_ADDR_BTCD=$( docker exec -it tor cat /var/lib/tor/hsv2bitcoind/hostname )
-        echo "Your local bitcoind (do not share) = $V2_ADDR_BTCD"
-        echo " "
-      fi
-    fi
   fi
 }
 
@@ -561,11 +518,7 @@ help() {
   echo "                                Available options:"
   echo "                                  -n [VALUE]                  : display the last VALUE lines"
   echo " "
-  echo "  onion [version]               Display the Tor onion addresses allowing your wallet to access your dojo."
-  echo " "
-  echo "                                Available versions:"
-  echo "                                  v2: display Tor v2 onion addresses"
-  echo "                                  v3 (default): display Tor v3 onion addresses"
+  echo "  onion                         Display the Tor onion addresses allowing your wallet to access your dojo."
   echo " "
   echo "  restart                       Restart your dojo."
   echo " "
@@ -659,7 +612,7 @@ case "$subcommand" in
     logs "$module" $numlines
     ;;
   onion )
-    onion "$@"
+    onion
     ;;
   restart )
     restart

docker/my-dojo/tor/restart.sh

@@ -13,9 +13,6 @@ tor_options=(
   --SocksPolicy "reject *"
   --DataDirectory /var/lib/tor/.tor
   --DataDirectoryGroupReadable 1
-  --HiddenServiceDir /var/lib/tor/hsv2dojo
-  --HiddenServiceVersion 2
-  --HiddenServicePort "80 $NET_DMZ_NGINX_IPV4:80"
   --HiddenServiceDir /var/lib/tor/hsv3dojo
   --HiddenServiceVersion 3
   --HiddenServicePort "80 $NET_DMZ_NGINX_IPV4:80"
@@ -23,11 +20,6 @@ tor_options=(
 
 if [ "$BITCOIND_INSTALL" == "on" ]; then
   if [ "$BITCOIND_LISTEN_MODE" == "on" ]; then
-    tor_options+=(--HiddenServiceDir /var/lib/tor/hsv2bitcoind)
-    tor_options+=(--HiddenServiceVersion 2)
-    tor_options+=(--HiddenServicePort "8333 $NET_DOJO_BITCOIND_IPV4:8333")
-    tor_options+=(--HiddenServiceDirGroupReadable 1)
-
     tor_options+=(--HiddenServiceDir /var/lib/tor/hsv3bitcoind)
     tor_options+=(--HiddenServiceVersion 3)
     tor_options+=(--HiddenServicePort "8333 $NET_DOJO_BITCOIND_IPV4:8333")
@@ -36,11 +28,6 @@ if [ "$BITCOIND_INSTALL" == "on" ]; then
 fi
 
 if [ "$EXPLORER_INSTALL" == "on" ]; then
-  tor_options+=(--HiddenServiceDir /var/lib/tor/hsv2explorer)
-  tor_options+=(--HiddenServiceVersion 2)
-  tor_options+=(--HiddenServicePort "80 $NET_DMZ_NGINX_IPV4:9080")
-  tor_options+=(--HiddenServiceDirGroupReadable 1)
-
   tor_options+=(--HiddenServiceDir /var/lib/tor/hsv3explorer)
   tor_options+=(--HiddenServiceVersion 3)
   tor_options+=(--HiddenServicePort "80 $NET_DMZ_NGINX_IPV4:9080")
@@ -48,11 +35,6 @@ if [ "$EXPLORER_INSTALL" == "on" ]; then
 fi
 
 if [ "$WHIRLPOOL_INSTALL" == "on" ]; then
-  tor_options+=(--HiddenServiceDir /var/lib/tor/hsv2whirlpool)
-  tor_options+=(--HiddenServiceVersion 2)
-  tor_options+=(--HiddenServicePort "80 $NET_DMZ_NGINX_IPV4:8898")
-  tor_options+=(--HiddenServiceDirGroupReadable 1)
-
   tor_options+=(--HiddenServiceDir /var/lib/tor/hsv3whirlpool)
   tor_options+=(--HiddenServiceVersion 3)
   tor_options+=(--HiddenServicePort "80 $NET_DMZ_NGINX_IPV4:8898")