Merge pull request #48625 from exarkun/48622.tor-disable-socksport

nixos/tor: better support non-anonymous services
2018-10-21 18:27:02 +00:00 · 2018-10-21 18:27:02 +00:00 · ca127588c1
parent 9c39154a96 4a71e2942c
commit ca127588c1
1 changed files with 5 additions and 0 deletions
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@ -57,6 +57,11 @@ let
    AutomapHostsSuffixes ${concatStringsSep "," cfg.client.dns.automapHostsSuffixes}
    ''}
  ''
+  # Explicitly disable the SOCKS server if the client is disabled.  In
+  # particular, this makes non-anonymous hidden services possible.
+  + optionalString (! cfg.client.enable) ''
+  SOCKSPort 0
+  ''
  # Relay config
  + optionalString cfg.relay.enable ''
    ORPort ${toString cfg.relay.port}