services: use new 'tor' options

This commit is contained in:
Erik Arvstedt
2021-08-05 00:49:00 +02:00
parent e44f78ebb8
commit 178a0dcf8f
18 changed files with 56 additions and 39 deletions

View File

@@ -57,14 +57,14 @@ in {
# Define hidden services
services.tor = {
enable = true;
hiddenServices = genAttrs activeServices (name:
relay.onionServices = genAttrs activeServices (name:
let
service = config.services.${name};
inherit (cfg.${name}) externalPort;
in nbLib.mkHiddenService {
in nbLib.mkOnionService {
port = if externalPort != null then externalPort else service.port;
toPort = service.port;
toHost = if service.address == "0.0.0.0" then "127.0.0.1" else service.address;
target.port = service.port;
target.addr = if service.address == "0.0.0.0" then "127.0.0.1" else service.address;
}
);
};