diff --git a/cluster/services/ipfs/default.nix b/cluster/services/ipfs/default.nix index a7c875d..6eaa468 100644 --- a/cluster/services/ipfs/default.nix +++ b/cluster/services/ipfs/default.nix @@ -14,8 +14,10 @@ VEGAS = "Qmd7QHZU8UjfYdwmjmq1SBh9pvER9AwHpfwQvnvNo3HBBo"; prophet = "12D3KooWQWsHPUUeFhe4b6pyCaD1hBoj8j6Z7S7kTznRTh1p1eVt"; }.${name}; - multiaddrTcp = "/ip4/${self.ipv4}/tcp/${self.portStr}/p2p/${self.extra.peerId}"; - multiaddrQuic = "/ip4/${self.ipv4}/udp/${self.portStr}/quic/p2p/${self.extra.peerId}"; + multiaddrs = [ + "/ip4/${self.ipv4}/udp/${self.portStr}/quic" + "/ip4/${self.ipv4}/tcp/${self.portStr}" + ]; }; }; }); diff --git a/cluster/services/ipfs/node.nix b/cluster/services/ipfs/node.nix index 9069230..9c41665 100644 --- a/cluster/services/ipfs/node.nix +++ b/cluster/services/ipfs/node.nix @@ -57,7 +57,10 @@ in Access-Control-Allow-Methods = [ "PUT" "POST" ]; }; Peering.Peers = map - (name: cluster.config.hostLinks.${name}.ipfs.extra.multiaddrQuic) + (name: let inherit (cluster.config.hostLinks.${name}.ipfs) extra; in { + ID = extra.peerId; + Addrs = extra.multiaddrs; + }) cluster.config.services.ipfs.otherNodes.node; Gateway = { Writable = false;