From 1fd10d8cde6d5a5ce9dc4636b99d0961fbf8d669 Mon Sep 17 00:00:00 2001 From: vdo Date: Wed, 8 Jun 2022 12:39:18 +0100 Subject: [PATCH] add lws service --- .env | 5 +++++ docker-compose.yml | 30 ++++++++++++++++++++++++++++++ install | 20 ++++++++++++++++++-- 3 files changed, 53 insertions(+), 2 deletions(-) diff --git a/.env b/.env index a420223..9806607 100644 --- a/.env +++ b/.env @@ -10,9 +10,14 @@ MONEROD_TAG=latest MONEROD_RPC_PORT=18081 MONEROD_RESTRICTED_RPC_PORT=18089 MONEROD_P2P_PORT=18080 +MONEROD_ZMQ_RPC_PORT=18082 +MONEROD_ZMQ_PUB_PORT=18083 MONEROD_EXTRA_PARAMS= MONEROD_accessControlAllowOriginList=* +LWS_TAG=0.17-15bce7f +LWS_PORT=8000 + #TOR_TAG=latest TOR_TAG=0.4.7.7 TOR_HTTP_PORT=80 diff --git a/docker-compose.yml b/docker-compose.yml index 222e8b8..734610f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -38,6 +38,7 @@ x-monerod-command: &monerod-command --public-node --no-igd --no-zmq --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 --rpc-bind-port=${MONEROD_RPC_PORT} --rpc-bind-ip=0.0.0.0 ${MONEROD_EXTRA_PARAMS} @@ -77,6 +78,34 @@ x-explorer-service: &explorer-service - "traefik.http.services.explorer.loadbalancer.server.port=${EXPLORER_PORT}" <<: *log-config +x-monero-lws-service: &monero-lws-service + monero-lws: + image: vdo1138/monero-lws:${LWS_TAG} + container_name: monero-lws + restart: unless-stopped + command: >- + --rest-server http://0.0.0.0:8000 --daemon=tcp://monerod:${MONEROD_ZMQ_RPC_PORT} + --sub=tcp://monerod:${MONEROD_ZMQ_SUB_PORT} --log-level=4 + --confirm-external-bind + volumes: + - ./data/monero-lws:/home/monero-lws/.bitmonero/ + # ports: + # - ${LWS_PORT} + depends_on: + - monerod + labels: + - "traefik.enable=true" + - "traefik.http.routers.monero-lws.rule=(PathPrefix(`/lws`) )" #!nole + # - "traefik.http.routers.monero-lws.rule=(Host(`${DOMAIN}`) && PathPrefix(`/monero-lws`) )" #!le + # - "traefik.http.routers.monero-lws.tls.certresolver=le" #!le + - "traefik.http.middlewares.stripprefix-monero-lws.stripprefix.prefixes=/lws" + - "traefik.http.routers.monero-lws.middlewares=stripprefix-monero-lws" + - "traefik.http.routers.monero-lws.entrypoints=websecure" + - "traefik.http.routers.monero-lws.tls" + - "traefik.http.routers.monero-lws.service=monero-lws" + - "traefik.http.services.monero-lws.loadbalancer.server.port=${LWS_PORT}" + <<: *log-config + x-monero-exporter-service: &monero-exporter-service monero-exporter: command: @@ -177,6 +206,7 @@ services: # <<: *tor-service #!tor # <<: *explorer-service #!explorer + # <<: *monero-lws-service #!lws # <<: *monero-exporter-service #!monero-exporter # <<: *grafana-service #!grafana # <<: *prometheus-service #!prometheus diff --git a/install b/install index 6da2356..adaeda4 100755 --- a/install +++ b/install @@ -301,6 +301,22 @@ configure_explorer() { done } +configure_lws() { + echo -e "${OkBullet}Configuring LWS..." + while true; do + read -r -e -p " Do you want to enable the light wallet service? [y/n]: " yn + case $yn in + [Yy]*) + sed -i '/#!lws/s/# //g' docker-compose.yml + ENABLE_LWS=true + break + ;; + [Nn]*) break ;; + *) echo " Please answer yes or no." ;; + esac + done +} + configure_grafana() { echo -e "${OkBullet}Configuring grafana..." while true; do @@ -419,14 +435,14 @@ configure_network configure_tls_domain configure_tls_port configure_pruning +configure_lws configure_cors - configure_tor # Deployment of explorer disabled until it's stable. # configure_explorer configure_watchtower configure_grafana -# configure_lws + start_xmrsh completed