git.iko.soy/typeable/nixpkgs
on master help sign in
nixos/ipfs: Allow QUIC connections to socket activate too

Well, via the underlying UDP. QUIC-level socket activation we'll get someday.

commite6fe9abd8b1b80c9911bc1469eef9cfb0b3f0003 authorJohn Ericson <git@JohnEricson.me> dateTue 11 Aug 2020, 17:46 (6 years ago) parent70d68f0
1 file changed+17−3
nixos/modules/services/network-filesystems/ipfs.nix+17−3
nixos/modules/services/network-filesystems/ipfs.nix+17−3
@@ -25,6 +25,15 @@ let
2525 then "/${lib.concatStringsSep "/" (lib.tail addr)}"
2626 else null; # not valid for listen stream, skip
2727
28+ multiaddrToListenDatagram = addrRaw: let
29+ addr = splitMulitaddr addrRaw;
30+ s = builtins.elemAt addr;
31+ in if s 0 == "ip4" && s 2 == "udp"
32+ then "${s 1}:${s 3}"
33+ else if s 0 == "ip6" && s 2 == "udp"
34+ then "[${s 1}]:${s 3}"
35+ else null; # not valid for listen datagram, skip
36+
2837in {
2938
3039 ###### interface
@@ -268,9 +277,14 @@ in {
268277
269278 systemd.sockets.ipfs-gateway = {
270279 wantedBy = [ "sockets.target" ];
271− socketConfig.ListenStream = let
272− fromCfg = multiaddrToListenStream cfg.gatewayAddress;
273− in [ "" ] ++ lib.optional (fromCfg != null) fromCfg;
280+ socketConfig = {
281+ ListenStream = let
282+ fromCfg = multiaddrToListenStream cfg.gatewayAddress;
283+ in [ "" ] ++ lib.optional (fromCfg != null) fromCfg;
284+ ListenDatagram = let
285+ fromCfg = multiaddrToListenDatagram cfg.gatewayAddress;
286+ in [ "" ] ++ lib.optional (fromCfg != null) fromCfg;
287+ };
274288 };
275289
276290 systemd.sockets.ipfs-api = {