move enforceTor logic to service modules

This enables tor support for services without using secure-node.nix
2020-10-29 21:21:27 +01:00
parent 0cc8caa737
commit e0675cb256
6 changed files with 9 additions and 21 deletions
@@ -91,7 +91,7 @@ in {
    };
    tor-socks = mkOption {
      type = types.nullOr types.str;
-      default = null;
+      default = if cfg.enforceTor then config.services.tor.client.socksListenAddress else null;
      description = "Set a socks proxy to use to connect to Tor nodes";
    };
    announce-tor = mkOption {