From e69f4319fcde500c2b854a8ecb859a2797b0cef7 Mon Sep 17 00:00:00 2001
From: Anatolios Laskaris <github_me@nahsi.dev>
Date: Mon, 18 Sep 2023 15:41:33 +0300
Subject: [PATCH] chore: Fix external connection to IPFS (#17)

Fix external connection to IPFS
---
 deployment/job.nomad.hcl | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/deployment/job.nomad.hcl b/deployment/job.nomad.hcl
index 749f101c6..d6b6600ba 100644
--- a/deployment/job.nomad.hcl
+++ b/deployment/job.nomad.hcl
@@ -51,9 +51,15 @@ job "nox" {
       }
       port "metrics" {}
 
-      port "ipfs_swarm" {}
-      port "ipfs_api" {}
-      port "ipfs_gateway" {}
+      port "ipfs_swarm" {
+        host_network = "public"
+      }
+      port "ipfs_api" {
+        host_network = "public"
+      }
+      port "ipfs_gateway" {
+        host_network = "public"
+      }
 
       port "promtail" {}
     }
@@ -157,10 +163,10 @@ job "nox" {
         IPFS_ADDRESSES_SWARM    = "/ip4/0.0.0.0/tcp/${NOMAD_PORT_ipfs_swarm},/ip4/0.0.0.0/tcp/${NOMAD_PORT_ipfs_swarm}/ws"
         IPFS_ADDRESSES_API      = "/ip4/0.0.0.0/tcp/${NOMAD_PORT_ipfs_api}"
         IPFS_ADDRESSES_GATEWAY  = "/ip4/0.0.0.0/tcp/${NOMAD_PORT_ipfs_gateway}"
-        IPFS_ADDRESSES_ANNOUNCE = "/ip4/${attr.unique.network.ip-address}/tcp/${NOMAD_PORT_ipfs_swarm},/ip4/${attr.unique.network.ip-address}/tcp/${NOMAD_PORT_ipfs_swarm}/ws"
+        IPFS_ADDRESSES_ANNOUNCE = "/ip4/${NOMAD_HOST_IP_ipfs_swarm}/tcp/${NOMAD_PORT_ipfs_swarm},/ip4/${NOMAD_HOST_IP_ipfs_swarm}/tcp/${NOMAD_PORT_ipfs_swarm}/ws"
         IPFS_PATH               = "/.fluence/ipfs"
 
-        FLUENCE_ENV_AQUA_IPFS_EXTERNAL_API_MULTIADDR = "/ip4/${attr.unique.network.ip-address}/tcp/${NOMAD_PORT_ipfs_api}"
+        FLUENCE_ENV_AQUA_IPFS_EXTERNAL_API_MULTIADDR = "/ip4/${NOMAD_HOST_IP_ipfs_api}/tcp/${NOMAD_PORT_ipfs_api}"
         FLUENCE_ENV_AQUA_IPFS_LOCAL_API_MULTIADDR    = "/ip4/127.0.0.1/tcp/${NOMAD_PORT_ipfs_api}"
 
         FLUENCE_SYSTEM_SERVICES__ENABLE                      = "aqua-ipfs,decider"
@@ -169,6 +175,7 @@ job "nox" {
         FLUENCE_SYSTEM_SERVICES__DECIDER__NETWORK_ID         = "80001"
         FLUENCE_ENV_CONNECTOR_API_ENDPOINT                   = "https://polygon-mumbai.g.alchemy.com/v2/Lb6BZr1VMEgcpAfeUGCBw2-BMHzjWWoq"
         FLUENCE_ENV_CONNECTOR_FROM_BLOCK                     = "0x25C5AD8"
+        FLUENCE_ENV_CONNECTOR_CONTRACT_ADDRESS               = "0x38A7fF922d7FeAE7CA7D3242BC4e87614f1FfDda"
 
         FLUENCE_CONFIG      = "/local/Config.toml"
         FLUENCE_LOG__FORMAT = "logfmt"
@@ -251,7 +258,6 @@ job "nox" {
         {{- with secret (env "NOMAD_ALLOC_INDEX" | printf "kv/nox/stage/nodes/%s") -}}
         KEY={{ .Data.private }}
         FLUENCE_ENV_CONNECTOR_WALLET_KEY={{ .Data.wallet_key }}
-        FLUENCE_ENV_CONNECTOR_CONTRACT_ADDRESS="0x38A7fF922d7FeAE7CA7D3242BC4e87614f1FfDda"
         {{- end -}}
         EOH
         destination = "secrets/node-secrets.env"