Cleanup gossip port changes

iotaledger · May 24, 2024 · 53df1c0 · 53df1c0
1 parent c37bdc2
commit 53df1c0
Show file tree

Hide file tree

Showing 10 changed files with 129 additions and 117 deletions.
diff --git a/iota-testnet/docker-compose.yml b/iota-testnet/docker-compose.yml
@@ -3,7 +3,6 @@
 # https://github.com/iotaledger/node-docker-setup
 #
 
-version: "3"
 services:
   ##################################################################
   #  HORNET                                                        #
@@ -21,8 +20,8 @@ services:
       traefik:
         condition: service_started
     ports:
-      - "${P2P_GOSSIP_PORT:-15600}:15600/tcp"
-      - "14626:14626/udp"
+      - "${HORNET_GOSSIP_PORT:-15600}:${HORNET_GOSSIP_PORT:-15600}/tcp"
+      - "${HORNET_AUTOPEERING_PORT:-14626}:${HORNET_AUTOPEERING_PORT:-14626}/udp"
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.hornet.service=hornet"
@@ -44,8 +43,8 @@ services:
       - "config.json"
       - "--db.path=data/database"
       - "--p2p.db.path=data/p2pstore"
-      - "--p2p.bindMultiAddresses=/ip4/0.0.0.0/tcp/15600,/ip6/::/tcp/15600"
-      - "--p2p.autopeering.externalMultiAddresses=${EXTERNAL_P2P_MULTIADDRESS:-}"
+      - "--p2p.bindMultiAddresses=/ip4/0.0.0.0/tcp/${HORNET_GOSSIP_PORT:-15600},/ip6/::/tcp/${HORNET_GOSSIP_PORT:-15600}"
+      - "--p2p.autopeering.bindAddress=0.0.0.0:${HORNET_AUTOPEERING_PORT:-14626}"
       - "--snapshots.fullPath=data/snapshots/full_snapshot.bin"
       - "--snapshots.deltaPath=data/snapshots/delta_snapshot.bin"
       - "--inx.enabled=true"

diff --git a/iota-testnet/env_template b/iota-testnet/env_template
@@ -10,13 +10,6 @@
 # The .env file is your personal configuration and is used by Docker.
 # Uncomment and edit the lines to fit your needs
 
-######################
-# Port setup section #
-######################
-
-# The default port for gossip is 15600. If you want to change that, uncomment the following line and change the port number.
-#P2P_GOSSIP_PORT=15601
-
 #
 # HINT: You either have to choose a HTTP or a HTTPS setup. 
 #       Do not uncomment lines in both sections.
@@ -46,16 +39,6 @@
 # You need to specify the domain name of your node to automatically get a valid SSL certificate via "letsencrypt.org" 
 #NODE_HOST=node.your-domain.com
 
-# Uncomment the following line to expose your DNS address for autopeering instead of the IP address.
-#EXTERNAL_P2P_MULTIADDRESS=/dns/${NODE_HOST}/tcp/${P2P_GOSSIP_PORT:-15600}
-
-#######################
-# config file section #
-#######################
-
-# Overwrite the default config file by uncommenting the following line (default: config.json).
-#HORNET_CONFIG_FILE=config.json
-
 ####################
 # profiles section #
 ####################
@@ -80,24 +63,43 @@
 # WASP Dashboard will be available under <NODE_HOST>/wasp/dashboard
 #COMPOSE_PROFILES=${COMPOSE_PROFILES},wasp
 
+##################
+# HORNET section #
+##################
+
+# Overwrite the default config file by uncommenting the following line (default: config.json).
+#HORNET_CONFIG_FILE=config.json
+
+# Uncomment the following line change the HORNET gossip TCP port (default: 15600).
+#HORNET_GOSSIP_PORT=15600
+
+# Uncomment the following line change the HORNET autopeering UDP port (default: 14626).
+#HORNET_AUTOPEERING_PORT=14626
+
 #####################
 # Dashboard section #
 #####################
 
 # Choose a dashboard username (default: admin)
 #DASHBOARD_USERNAME=admin
 
-# Generate a new password and salt using the following command:
+# Generate a new password and salt by using the following command:
+#
 #   docker compose run hornet tools pwd-hash
+#
+# or if you are not in the same directory as the docker-compose.yml file:
+#
+#   docker run -it --rm iotaledger/hornet:latest tools pwd-hash
+#
 #DASHBOARD_PASSWORD=0000000000000000000000000000000000000000000000000000000000000000
 #DASHBOARD_SALT=0000000000000000000000000000000000000000000000000000000000000000
 
 ################
 # WASP section #
 ################
 
-# Choose how many states to keep
+# Uncomment the following line if you want to change how many states are kept in wasp (default: 10000).
 #WASP_PRUNING_MIN_STATES_TO_KEEP=10000
 
-# Path to download wasp snapshot from
+# Uncomment the following line if you want to change the wasp snapshot source.
 #WASP_SNAPSHOT_NETWORK_PATHS=https://files.iota-testnet.iotaledger.net/?prefix=wasp_snapshots/tst1pzxsrr7apqkdzz633dyntmvxwtyvk029p39te5j0m33q6946h7akzv663zu/
diff --git a/iota/docker-compose.yml b/iota/docker-compose.yml
@@ -20,8 +20,8 @@ services:
       traefik:
         condition: service_started
     ports:
-      - "${P2P_GOSSIP_PORT:-15600}:15600/tcp"
-      - "14626:14626/udp"
+      - "${HORNET_GOSSIP_PORT:-15600}:${HORNET_GOSSIP_PORT:-15600}/tcp"
+      - "${HORNET_AUTOPEERING_PORT:-14626}:${HORNET_AUTOPEERING_PORT:-14626}/udp"
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.hornet.service=hornet"
@@ -43,8 +43,8 @@ services:
       - "config.json"
       - "--db.path=data/database"
       - "--p2p.db.path=data/p2pstore"
-      - "--p2p.bindMultiAddresses=/ip4/0.0.0.0/tcp/15600,/ip6/::/tcp/15600"
-      - "--p2p.autopeering.externalMultiAddresses=${EXTERNAL_P2P_MULTIADDRESS:-}"
+      - "--p2p.bindMultiAddresses=/ip4/0.0.0.0/tcp/${HORNET_GOSSIP_PORT:-15600},/ip6/::/tcp/${HORNET_GOSSIP_PORT:-15600}"
+      - "--p2p.autopeering.bindAddress=0.0.0.0:${HORNET_AUTOPEERING_PORT:-14626}"
       - "--snapshots.fullPath=data/snapshots/full_snapshot.bin"
       - "--snapshots.deltaPath=data/snapshots/delta_snapshot.bin"
       - "--inx.enabled=true"

diff --git a/iota/env_template b/iota/env_template
@@ -10,13 +10,6 @@
 # The .env file is your personal configuration and is used by Docker.
 # Uncomment and edit the lines to fit your needs
 
-######################
-# Port setup section #
-######################
-
-# The default port for gossip is 15600. If you want to change that, uncomment the following line and change the port number.
-#P2P_GOSSIP_PORT=15601
-
 #
 # HINT: You either have to choose a HTTP or a HTTPS setup. 
 #       Do not uncomment lines in both sections.
@@ -46,16 +39,6 @@
 # You need to specify the domain name of your node to automatically get a valid SSL certificate via "letsencrypt.org" 
 #NODE_HOST=node.your-domain.com
 
-# Uncomment the following line to expose your DNS address for autopeering instead of the IP address.
-#EXTERNAL_P2P_MULTIADDRESS=/dns/${NODE_HOST}/tcp/${P2P_GOSSIP_PORT:-15600}
-
-#######################
-# config file section #
-#######################
-
-# Overwrite the default config file by uncommenting the following line (default: config.json).
-#HORNET_CONFIG_FILE=config.json
-
 ####################
 # profiles section #
 ####################
@@ -80,24 +63,43 @@
 # WASP Dashboard will be available under <NODE_HOST>/wasp/dashboard
 #COMPOSE_PROFILES=${COMPOSE_PROFILES},wasp
 
+##################
+# HORNET section #
+##################
+
+# Overwrite the default config file by uncommenting the following line (default: config.json).
+#HORNET_CONFIG_FILE=config.json
+
+# Uncomment the following line change the HORNET gossip TCP port (default: 15600).
+#HORNET_GOSSIP_PORT=15600
+
+# Uncomment the following line change the HORNET autopeering UDP port (default: 14626).
+#HORNET_AUTOPEERING_PORT=14626
+
 #####################
 # Dashboard section #
 #####################
 
 # Choose a dashboard username (default: admin)
 #DASHBOARD_USERNAME=admin
 
-# Generate a new password and salt using the following command:
+# Generate a new password and salt by using the following command:
+#
 #   docker compose run hornet tools pwd-hash
+#
+# or if you are not in the same directory as the docker-compose.yml file:
+#
+#   docker run -it --rm iotaledger/hornet:latest tools pwd-hash
+#
 #DASHBOARD_PASSWORD=0000000000000000000000000000000000000000000000000000000000000000
 #DASHBOARD_SALT=0000000000000000000000000000000000000000000000000000000000000000
 
 ################
 # WASP section #
 ################
 
-# Choose how many states to keep
+# Uncomment the following line if you want to change how many states are kept in wasp (default: 10000).
 #WASP_PRUNING_MIN_STATES_TO_KEEP=10000
 
-# Path to download wasp snapshot from
+# Uncomment the following line if you want to change the wasp snapshot source.
 #WASP_SNAPSHOT_NETWORK_PATHS=https://files.stardust-mainnet.iotaledger.net/?prefix=wasp_snapshots/iota1pzt3mstq6khgc3tl0mwuzk3eqddkryqnpdxmk4nr25re2466uxwm28qqxu5/
diff --git a/iota2-testnet/docker-compose.yml b/iota2-testnet/docker-compose.yml
@@ -21,7 +21,7 @@ services:
       traefik:
         condition: service_started
     ports:
-      - "${P2P_GOSSIP_PORT:-15600}:15600/tcp"
+      - "${IOTA_CORE_GOSSIP_PORT:-15600}:${IOTA_CORE_GOSSIP_PORT:-15600}/tcp"
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.iota-core.service=iota-core"
@@ -40,9 +40,9 @@ services:
       - ./data:/app/data
     command: >
       -c config.json
-      --p2p.bindMultiAddresses=/ip4/0.0.0.0/tcp/15600,/ip6/::/tcp/15600
+      --p2p.bindMultiAddresses=/ip4/0.0.0.0/tcp/${IOTA_CORE_GOSSIP_PORT:-15600},/ip6/::/tcp/${IOTA_CORE_GOSSIP_PORT:-15600}
       --p2p.identityPrivateKeyFilePath=data/p2p/identity.key
-      --p2p.autopeering.externalMultiAddresses=${EXTERNAL_P2P_MULTIADDRESS:-}
+      --p2p.autopeering.externalMultiAddresses=${IOTA_CORE_EXTERNAL_P2P_MULTIADDRESS:-}
       --profiling.bindAddress=iota-core:6060
       --debugAPI.db.path=data/debug
       --db.path=data/database

diff --git a/iota2-testnet/env_template b/iota2-testnet/env_template
@@ -10,13 +10,6 @@
 # The .env file is your personal configuration and is used by Docker.
 # Uncomment and edit the lines to fit your needs
 
-######################
-# Port setup section #
-######################
-
-# The default port for gossip is 15600. If you want to change that, uncomment the following line and change the port number.
-#P2P_GOSSIP_PORT=15601
-
 #
 # HINT: You either have to choose a HTTP or a HTTPS setup. 
 #       Do not uncomment lines in both sections.
@@ -46,16 +39,6 @@
 # You need to specify the domain name of your node to automatically get a valid SSL certificate via "letsencrypt.org" 
 #NODE_HOST=node.your-domain.com
 
-# Uncomment the following line to expose your DNS address for autopeering instead of the IP address.
-#EXTERNAL_P2P_MULTIADDRESS=/dns/${NODE_HOST}/tcp/${P2P_GOSSIP_PORT:-15600}
-
-#######################
-# config file section #
-#######################
-
-# Overwrite the default config file by uncommenting the following line (default: config.json).
-#IOTA_CORE_CONFIG_FILE=config.json
-
 ####################
 # profiles section #
 ####################
@@ -74,13 +57,35 @@
 # WARNING: Do not forget to set VALIDATOR_ACCOUNT_ADDR and VALIDATOR_PRV_KEY in the validator section
 #COMPOSE_PROFILES=${COMPOSE_PROFILES},validator
 
+#####################
+# IOTA-Core section #
+#####################
+
+# Overwrite the default config file by uncommenting the following line (default: config.json).
+#IOTA_CORE_CONFIG_FILE=config.json
+
+# Uncomment the following line change the IOTA-Core gossip TCP port (default: 15600).
+#IOTA_CORE_GOSSIP_PORT=15600
+
+# Uncomment the following line to expose your DNS address for autopeering instead of the IP address.
+#IOTA_CORE_EXTERNAL_P2P_MULTIADDRESS=/dns/${NODE_HOST}/tcp/${IOTA_CORE_GOSSIP_PORT:-15600}
+
 #####################
 # dashboard section #
 #####################
 
 # Choose a dashboard username (default: admin)
 #DASHBOARD_USERNAME=admin
 
+# Generate a new password and salt by using the following command:
+#
+#   docker compose run iota-core tools pwd-hash
+#
+# or if you are not in the same directory as the docker-compose.yml file:
+#
+#   docker run -it --rm iotaledger/iota-core:1.0-beta tools pwd-hash
+#
+
 # Generate a new password and salt using the following command:
 #   docker compose run iota-core tools pwd-hash
 #DASHBOARD_PASSWORD=0000000000000000000000000000000000000000000000000000000000000000

diff --git a/shimmer-testnet/docker-compose.yml b/shimmer-testnet/docker-compose.yml
@@ -20,8 +20,8 @@ services:
       traefik:
         condition: service_started
     ports:
-      - "${P2P_GOSSIP_PORT:-15600}:15600/tcp"
-      - "14626:14626/udp"
+      - "${HORNET_GOSSIP_PORT:-15600}:${HORNET_GOSSIP_PORT:-15600}/tcp"
+      - "${HORNET_AUTOPEERING_PORT:-14626}:${HORNET_AUTOPEERING_PORT:-14626}/udp"
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.hornet.service=hornet"
@@ -43,8 +43,8 @@ services:
       - "config.json"
       - "--db.path=data/database"
       - "--p2p.db.path=data/p2pstore"
-      - "--p2p.bindMultiAddresses=/ip4/0.0.0.0/tcp/15600,/ip6/::/tcp/15600"
-      - "--p2p.autopeering.externalMultiAddresses=${EXTERNAL_P2P_MULTIADDRESS:-}"
+      - "--p2p.bindMultiAddresses=/ip4/0.0.0.0/tcp/${HORNET_GOSSIP_PORT:-15600},/ip6/::/tcp/${HORNET_GOSSIP_PORT:-15600}"
+      - "--p2p.autopeering.bindAddress=0.0.0.0:${HORNET_AUTOPEERING_PORT:-14626}"
       - "--snapshots.fullPath=data/snapshots/full_snapshot.bin"
       - "--snapshots.deltaPath=data/snapshots/delta_snapshot.bin"
       - "--inx.enabled=true"

diff --git a/shimmer-testnet/env_template b/shimmer-testnet/env_template
@@ -10,13 +10,6 @@
 # The .env file is your personal configuration and is used by Docker.
 # Uncomment and edit the lines to fit your needs
 
-######################
-# Port setup section #
-######################
-
-# The default port for gossip is 15600. If you want to change that, uncomment the following line and change the port number.
-#P2P_GOSSIP_PORT=15601
-
 #
 # HINT: You either have to choose a HTTP or a HTTPS setup. 
 #       Do not uncomment lines in both sections.
@@ -46,16 +39,6 @@
 # You need to specify the domain name of your node to automatically get a valid SSL certificate via "letsencrypt.org" 
 #NODE_HOST=node.your-domain.com
 
-# Uncomment the following line to expose your DNS address for autopeering instead of the IP address.
-#EXTERNAL_P2P_MULTIADDRESS=/dns/${NODE_HOST}/tcp/${P2P_GOSSIP_PORT:-15600}
-
-#######################
-# config file section #
-#######################
-
-# Overwrite the default config file by uncommenting the following line (default: config.json).
-#HORNET_CONFIG_FILE=config.json
-
 ####################
 # profiles section #
 ####################
@@ -80,24 +63,43 @@
 # WASP Dashboard will be available under <NODE_HOST>/wasp/dashboard
 #COMPOSE_PROFILES=${COMPOSE_PROFILES},wasp
 
+##################
+# HORNET section #
+##################
+
+# Overwrite the default config file by uncommenting the following line (default: config.json).
+#HORNET_CONFIG_FILE=config.json
+
+# Uncomment the following line change the HORNET gossip TCP port (default: 15600).
+#HORNET_GOSSIP_PORT=15600
+
+# Uncomment the following line change the HORNET autopeering UDP port (default: 14626).
+#HORNET_AUTOPEERING_PORT=14626
+
 #####################
 # Dashboard section #
 #####################
 
 # Choose a dashboard username (default: admin)
 #DASHBOARD_USERNAME=admin
 
-# Generate a new password and salt using the following command:
+# Generate a new password and salt by using the following command:
+#
 #   docker compose run hornet tools pwd-hash
+#
+# or if you are not in the same directory as the docker-compose.yml file:
+#
+#   docker run -it --rm iotaledger/hornet:latest tools pwd-hash
+#
 #DASHBOARD_PASSWORD=0000000000000000000000000000000000000000000000000000000000000000
 #DASHBOARD_SALT=0000000000000000000000000000000000000000000000000000000000000000
 
 ################
 # WASP section #
 ################
 
-# Choose how many states to keep
+# Uncomment the following line if you want to change how many states are kept in wasp (default: 10000).
 #WASP_PRUNING_MIN_STATES_TO_KEEP=10000
 
-# Path to download wasp snapshot from
+# Uncomment the following line if you want to change the wasp snapshot source.
 #WASP_SNAPSHOT_NETWORK_PATHS=https://files.testnet.shimmer.network/wasp_snapshots