From 8d003479f7bdcb21ccdea8cd72293b1fcce3b815 Mon Sep 17 00:00:00 2001 From: vdo Date: Thu, 9 Jun 2022 09:05:25 +0100 Subject: [PATCH] lws extra params --- .env | 1 + README.md | 2 +- docker-compose.yml | 4 ++-- install | 2 ++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.env b/.env index 9806607..540cba7 100644 --- a/.env +++ b/.env @@ -17,6 +17,7 @@ MONEROD_accessControlAllowOriginList=* LWS_TAG=0.17-15bce7f LWS_PORT=8000 +LWS_EXTRA_PARAMS= #TOR_TAG=latest TOR_TAG=0.4.7.7 diff --git a/README.md b/README.md index 02f92ff..b076a14 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ Check the [wiki](https://github.com/vdo/xmr.sh/wiki/FAQ) - [x] arm64 support for all images - [x] monerod-lws support (experimental) - [ ] Shellcheck via Github Actions -- [ ] Installation documentation +- [ ] Documentation - [ ] monerod-proxy support for random node forwarding - [ ] i2p service - [ ] p2pool mining diff --git a/docker-compose.yml b/docker-compose.yml index d5805ec..b0babed 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -38,7 +38,7 @@ x-monerod-command: &monerod-command --public-node --no-igd --enable-dns-blocklist --rpc-restricted-bind-ip=0.0.0.0 --rpc-restricted-bind-port=${MONEROD_RESTRICTED_RPC_PORT} --confirm-external-bind - --zmq-pub tcp://0.0.0.0:${MONEROD_ZMQ_PUB_PORT}--zmq-rpc-bind-port=${MONEROD_ZMQ_RPC_PORT} --zmq-rpc-bind-ip=0.0.0.0 + --zmq-pub tcp://0.0.0.0:${MONEROD_ZMQ_PUB_PORT} --zmq-rpc-bind-port=${MONEROD_ZMQ_RPC_PORT} --zmq-rpc-bind-ip=0.0.0.0 --rpc-bind-port=${MONEROD_RPC_PORT} --rpc-bind-ip=0.0.0.0 ${MONEROD_EXTRA_PARAMS} @@ -87,7 +87,7 @@ x-monero-lws-service: &monero-lws-service command: >- --rest-server http://0.0.0.0:8000 --daemon=tcp://monerod:${MONEROD_ZMQ_RPC_PORT} --sub=tcp://monerod:${MONEROD_ZMQ_PUB_PORT} --log-level=4 - --confirm-external-bind + --confirm-external-bind ${LWS_EXTRA_PARAMS} volumes: - ./data/monero-lws:/home/monero-lws/.bitmonero/ # ports: diff --git a/install b/install index 6c909d2..00cc806 100755 --- a/install +++ b/install @@ -187,12 +187,14 @@ configure_network() { NETWORK="testnet" sed -i "s/MONEROD_P2P_PORT=.*/MONEROD_P2P_PORT=28080/g" .env sed -i "/MONEROD_EXTRA_PARAMS/s/$/ --testnet/g" .env + sed -i "/LWS_EXTRA_PARAMS/s/$/ --network test/g" .env break ;; "stagenet") NETWORK="stagenet" sed -i "s/MONEROD_P2P_PORT=.*/MONEROD_P2P_PORT=38080/g" .env sed -i "/MONEROD_EXTRA_PARAMS/s/$/ --stagenet/g" .env + sed -i "/LWS_EXTRA_PARAMS/s/$/ --network stage/g" .env break ;; *) echo "Invalid network choice!" ;;