fixes for Tor and traefik ports

This commit is contained in:
kexkey
2020-01-16 14:40:31 -05:00
parent 00382c8ef3
commit 53ddf04217
4 changed files with 27 additions and 3 deletions

View File

@@ -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}"

20
sparkwallet/start.sh Normal file
View File

@@ -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

View File

@@ -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=$?

View File

@@ -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=$?