From 45938328c419e7e6b7cc968742ecbb7d733b609c Mon Sep 17 00:00:00 2001
From: kompotkot <zenitsws@gmail.com>
Date: Mon, 15 Nov 2021 22:32:11 +0000
Subject: [PATCH] Removed specific listening port for ndoe server and don't
 start geth

---
 nodes/deploy/ethereum/deploy.bash  | 19 ++++++-------------
 nodes/deploy/ethereum/geth.service |  1 -
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/nodes/deploy/ethereum/deploy.bash b/nodes/deploy/ethereum/deploy.bash
index 9c6a72f7..070387eb 100755
--- a/nodes/deploy/ethereum/deploy.bash
+++ b/nodes/deploy/ethereum/deploy.bash
@@ -71,16 +71,9 @@ systemctl status "${NODES_SERVER_SERVICE_FILE}"
 
 echo
 echo
-echo -e "${PREFIX_INFO} Updating Ethereum Geth service"
-if systemctl is-active --quiet "${ETHEREUM_GETH_SERVICE_FILE}"
-then
-    echo -e "${PREFIX_WARN} Ethereum Geth service ${ETHEREUM_GETH_SERVICE_FILE} already running"
-else
-    echo -e "${PREFIX_INFO} Restart Geth service ${ETHEREUM_GETH_SERVICE_FILE}"
-    chmod 644 "${SCRIPT_DIR}/${ETHEREUM_GETH_SERVICE_FILE}"
-    cp "${SCRIPT_DIR}/${ETHEREUM_GETH_SERVICE_FILE}" "/etc/systemd/system/${ETHEREUM_GETH_SERVICE_FILE}"
-    systemctl daemon-reload
-    systemctl disable "${ETHEREUM_GETH_SERVICE_FILE}"
-    systemctl restart "${ETHEREUM_GETH_SERVICE_FILE}"
-    sleep 10
-fi
+echo -e "${PREFIX_INFO} Replacing existing Ethereum Geth service definition with ${ETHEREUM_GETH_SERVICE_FILE}"
+chmod 644 "${SCRIPT_DIR}/${ETHEREUM_GETH_SERVICE_FILE}"
+cp "${SCRIPT_DIR}/${ETHEREUM_GETH_SERVICE_FILE}" "/etc/systemd/system/${ETHEREUM_GETH_SERVICE_FILE}"
+systemctl daemon-reload
+systemctl disable "${ETHEREUM_GETH_SERVICE_FILE}"
+systemctl status "${ETHEREUM_GETH_SERVICE_FILE}"
diff --git a/nodes/deploy/ethereum/geth.service b/nodes/deploy/ethereum/geth.service
index 009bb9d2..c4b05ac6 100644
--- a/nodes/deploy/ethereum/geth.service
+++ b/nodes/deploy/ethereum/geth.service
@@ -7,7 +7,6 @@ User=ubuntu
 Group=www-data
 EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env
 ExecStart=/usr/bin/geth --syncmode snap --cache 4096 \
-    --port "${MOONSTREAM_NODE_ETHEREUM_LISTENING_PORT}" \
     --datadir /mnt/disks/nodes/ethereum \
     --txpool.globalslots 153600 --txpool.globalqueue 3072 \
     --http --http.api eth,web3,txpool \