Merge branch 'feat_mydojo_whirlpool_hs_switch' into 'develop'

add new WHIRLPOOL_COORDINATOR_ONION config option

See merge request dojo/samourai-dojo!190

docker/my-dojo/conf/docker-whirlpool.conf.tpl

@@ -10,6 +10,10 @@ WHIRLPOOL_INSTALL=off
 # Value: on | off
 WHIRLPOOL_RESYNC=off
 
+# Contact coordinator through its onion address or clearnet address
+# Set to on for onion address, set to off for clearnet address
+# Value: on | off
+WHIRLPOOL_COORDINATOR_ONION=on
 
 #
 # EXPERT SETTINGS

docker/my-dojo/whirlpool/restart.sh

@@ -9,7 +9,6 @@ whirlpool_options=(
   --cli.tor=true
   --cli.torConfig.executable=/usr/local/bin/tor
   --cli.torConfig.coordinator.enabled=true
-  --cli.torConfig.coordinator.onion=true
   --cli.torConfig.backend.enabled=false
   --cli.torConfig.backend.onion=false
   --cli.mix.liquidityClient=false
@@ -23,6 +22,12 @@ else
   whirlpool_options+=(--cli.dojo.url="http://172.30.1.3:80/v2/")
 fi
 
+if [ "$WHIRLPOOL_COORDINATOR_ONION" == "on" ]; then
+  whirlpool_options+=(--cli.torConfig.coordinator.onion=true)
+else
+  whirlpool_options+=(--cli.torConfig.coordinator.onion=false)
+fi
+
 if [ "$WHIRLPOOL_RESYNC" == "on" ]; then
   whirlpool_options+=(--resync)
 fi