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

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

Browse Source 
nixos/tor: better support non-anonymous services
This commit is contained in:
Joachim F 2018-10-21 18:27:02 +00:00 committed by GitHub
commit ca127588c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/services/security/tor.nix
View File

@ -57,6 +57,11 @@ let
AutomapHostsSuffixes ${concatStringsSep "," cfg.client.dns.automapHostsSuffixes} 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 # Relay config
+ optionalString cfg.relay.enable '' + optionalString cfg.relay.enable ''
ORPort ${toString cfg.relay.port} ORPort ${toString cfg.relay.port}