fixes for Tor and traefik ports

sparkwallet/docker-compose.yaml

@@ -2,7 +2,7 @@ version: "3"
 
 services:
   cyphernode_sparkwallet:
-    command: --no-tls
+    command: --no-tls ${TOR_PARAMS}
     image: cyphernode/sparkwallet:v0.2.12
     environment:
       - "NETWORK=${NETWORK}"

sparkwallet/start.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# . ./.cyphernodeconf/installer/config.sh
+
+export DOCKER_MODE
+export NETWORK
+export LIGHTNING_DATAPATH
+export APP_SCRIPT_PATH
+export GATEKEEPER_DATAPATH
+export FEATURE_TOR
+
+if [ "${FEATURE_TOR}" = "true" ]; then
+  export TOR_PARAMS=" --proxy socks5h://tor:9050 --rate-provider wasabi "
+fi
+
+if [ "$DOCKER_MODE" = "swarm" ]; then
+  docker stack deploy -c $APP_SCRIPT_PATH/docker-compose.yaml $APP_ID
+elif [ "$DOCKER_MODE" = "compose" ]; then
+  docker-compose -f $APP_SCRIPT_PATH/docker-compose.yaml up -d --remove-orphans
+fi

sparkwallet/test.sh

@@ -25,11 +25,13 @@ timeout_feature() {
 
 do_test() {
   local rc
-  rc=$(curl -k -s -o /dev/null -w "%{http_code}" https://127.0.0.1/sparkwallet/)
+  rc=$(curl -k -s -o /dev/null -w "%{http_code}" https://127.0.0.1:${TRAEFIK_HTTPS_PORT}/sparkwallet/)
   [ "${rc}" -ne "401" ] && return 400
   return 0
 }
 
+export TRAEFIK_HTTPS_PORT
+
 timeout_feature do_test
 returncode=$?
 

welcome/test.sh

@@ -25,11 +25,13 @@ timeout_feature() {
 
 do_test() {
   local rc
-  rc=$(curl -k -s -o /dev/null -w "%{http_code}" https://127.0.0.1/welcome)
+  rc=$(curl -k -s -o /dev/null -w "%{http_code}" https://127.0.0.1:${TRAEFIK_HTTPS_PORT}/welcome)
   [ "${rc}" -ne "401" ] && return 400
   return 0
 }
 
+export TRAEFIK_HTTPS_PORT
+
 timeout_feature do_test
 returncode=$?