services: add helper fn setAllowedIPAddresses

Also use 'allowLocalIPAddresses' instead of 'allowTor' in bitcoind-import-banlist
which doesn't use Tor.
This commit is contained in:
Erik Arvstedt 2021-03-22 13:19:45 +01:00
parent cdf27d9d0c
commit 020433cec6
No known key found for this signature in database
GPG key ID: 33312B944DD97846
11 changed files with 22 additions and 45 deletions

View file

@ -357,9 +357,7 @@ in {
Restart = "on-failure";
UMask = mkIf cfg.dataDirReadableByGroup "0027";
ReadWritePaths = cfg.dataDir;
} // (if cfg.enforceTor
then nbLib.allowTor
else nbLib.allowAnyIP)
} // nbLib.allowedIPAddresses cfg.enforceTor
// optionalAttrs (cfg.zmqpubrawblock != null || cfg.zmqpubrawtx != null) nbLib.allowAnyProtocol;
};
@ -385,7 +383,7 @@ in {
User = cfg.user;
Group = cfg.group;
ReadWritePaths = cfg.dataDir;
} // nbLib.allowTor;
} // nbLib.allowLocalIPAddresses;
};
users.users.${cfg.user}.group = cfg.group;