From 7b4495d55147b4582693915a2b0be9e527015a6b Mon Sep 17 00:00:00 2001
From: vdo <vdo@greyfaze.net>
Date: Wed, 8 Jun 2022 13:41:37 +0100
Subject: [PATCH] zmq params, exec order

---
 data/monero-lws/.gitignore | 4 ++++
 docker-compose.yml         | 4 ++--
 install                    | 6 +++---
 3 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 data/monero-lws/.gitignore

diff --git a/data/monero-lws/.gitignore b/data/monero-lws/.gitignore
new file mode 100644
index 0000000..5e7d273
--- /dev/null
+++ b/data/monero-lws/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/docker-compose.yml b/docker-compose.yml
index 734610f..d15434d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -35,7 +35,7 @@ x-traefik-command-nole: &traefik-command-nole
 
 x-monerod-command: &monerod-command
   command: >-
-    --public-node --no-igd --no-zmq
+    --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
@@ -85,7 +85,7 @@ x-monero-lws-service: &monero-lws-service
     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
+      --sub=tcp://monerod:${MONEROD_ZMQ_PUB_PORT} --log-level=4
       --confirm-external-bind
     volumes:
       - ./data/monero-lws:/home/monero-lws/.bitmonero/
diff --git a/install b/install
index adaeda4..b54c164 100755
--- a/install
+++ b/install
@@ -340,7 +340,7 @@ configure_grafana() {
 configure_watchtower() {
     echo -e "${OkBullet}Configuring watchtower..."
     while true; do
-        read -r -e -p "   Do you want to enable automatic updates using watchtower? [y/n]: " yn
+        read -r -e -p "   Do you want to enable automatic node updates using watchtower? [y/n]: " yn
         case $yn in
         [Yy]*)
             sed -i '/#!watchtower/s/# //g' docker-compose.yml
@@ -435,13 +435,13 @@ configure_network
 configure_tls_domain
 configure_tls_port
 configure_pruning
-configure_lws
 configure_cors
 configure_tor
+configure_lws
 # Deployment of explorer disabled until it's stable.
 # configure_explorer
-configure_watchtower
 configure_grafana
+configure_watchtower
 
 start_xmrsh
 completed