public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/ipfs: only set listenstream when gateway/api is default

Browse Source
This commit is contained in:
Matthew Bauer 2020-06-11 17:53:59 -05:00
parent 982a17a48e
commit 2c2f6c0b38
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/services/network-filesystems/ipfs.nix
View File

@ -1,7 +1,8 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, options, ... }:
with lib; with lib;
let let
cfg = config.services.ipfs; cfg = config.services.ipfs;
opt = options.services.ipfs;
ipfsFlags = toString ([ ipfsFlags = toString ([
(optionalString cfg.autoMount "--mount") (optionalString cfg.autoMount "--mount")
@ -247,15 +248,16 @@ in {
wantedBy = [ "default.target" ]; wantedBy = [ "default.target" ];
}; };
# Note the upstream service assumes default host / port
# we should override it when a custom is provided above.
systemd.sockets.ipfs-gateway = { systemd.sockets.ipfs-gateway = {
wantedBy = [ "sockets.target" ]; wantedBy = [ "sockets.target" ];
socketConfig.ListenStream = [ "" ]
++ lib.optional (cfg.gatewayAddress == opt.gatewayAddress.default) [ "127.0.0.1:8080" "[::1]:8080" ];
}; };
systemd.sockets.ipfs-api = { systemd.sockets.ipfs-api = {
wantedBy = [ "sockets.target" ]; wantedBy = [ "sockets.target" ];
socketConfig.ListenStream = [ "%t/ipfs.sock" ]; socketConfig.ListenStream = [ "" "%t/ipfs.sock" ]
++ lib.optional (cfg.apiAddress == opt.apiAddress.default) [ "127.0.0.1:5001" "[::1]:5001" ];
}; };
}; };