diff options
author | Peter Simons <simons@cryp.to> | 2011-09-14 18:20:50 +0000 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2011-09-14 18:20:50 +0000 |
commit | eb6e1310b8774f3aed4c5675d09708f0df6199d3 (patch) | |
tree | 3297542b3cda78d38731abb65837f4553cd377a9 /modules/services/security/tor.nix | |
parent | f5e8d35f8e76755febf97ca8f62b0700a8b6d20a (diff) | |
download | nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.gz nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.bz2 nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.lz nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.xz nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.zst nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.zip |
strip trailing whitespace; no functional change
svn path=/nixos/trunk/; revision=29285
Diffstat (limited to 'modules/services/security/tor.nix')
-rw-r--r-- | modules/services/security/tor.nix | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/modules/services/security/tor.nix b/modules/services/security/tor.nix index 6e1b2838ead..6582ba70253 100644 --- a/modules/services/security/tor.nix +++ b/modules/services/security/tor.nix @@ -22,15 +22,15 @@ in { ###### interface - + options = { - + services.tor = { config = mkOption { default = ""; description = '' - Extra configuration. Contents will be added verbatim to the + Extra configuration. Contents will be added verbatim to the configuration file. ''; }; @@ -49,7 +49,7 @@ in default = "127.0.0.1:9050"; example = "192.168.0.1:9100"; description = '' - Bind to this address to listen for connections from Socks-speaking + Bind to this address to listen for connections from Socks-speaking applications. ''; }; @@ -70,9 +70,9 @@ in default = true; description = '' Whether to enable a special instance of privoxy dedicated to Tor. - To have anonymity, protocols need to be scrubbed of identifying + To have anonymity, protocols need to be scrubbed of identifying information. - Most people using Tor want to anonymize their web traffic, so by + Most people using Tor want to anonymize their web traffic, so by default we enable an special instance of privoxy specifically for Tor. However, if you are only going to use Tor only for other kinds of @@ -84,9 +84,9 @@ in default = "127.0.0.1:8118"; description = '' Address that Tor's instance of privoxy is listening to. - *This does not configure the standard NixOS instance of privoxy.* - This is for Tor connections only! - See services.privoxy.listenAddress to configure the standard NixOS + *This does not configure the standard NixOS instance of privoxy.* + This is for Tor connections only! + See services.privoxy.listenAddress to configure the standard NixOS instace of privoxy. ''; }; @@ -94,11 +94,11 @@ in config = mkOption { default = ""; description = '' - Extra configuration for Tor's instance of privoxy. Contents will be + Extra configuration for Tor's instance of privoxy. Contents will be added verbatim to the configuration file. - *This does not configure the standard NixOS instance of privoxy.* - This is for Tor connections only! - See services.privoxy.extraConfig to configure the standard NixOS + *This does not configure the standard NixOS instance of privoxy.* + This is for Tor connections only! + See services.privoxy.extraConfig to configure the standard NixOS instace of privoxy. ''; }; @@ -107,7 +107,7 @@ in }; - relay = { + relay = { enable = mkOption { default = false; @@ -246,7 +246,7 @@ in torPrivoxy = { name = "tor-privoxy"; startOn = "starting tor"; - stopOn = "stopping tor"; + stopOn = "stopping tor"; preStart = '' mkdir -m 0755 -p ${privoxyDir} @@ -275,7 +275,7 @@ in ${if cfg.relay.isExit then opt "ExitPolicy" cfg.relay.exitPolicy else "ExitPolicy reject *:*"} ${if cfg.relay.isBridge then "BridgeRelay 1" else ""} ''; - + services.tor.client.privoxy.config = '' # Generally, this file goes in /etc/privoxy/config # @@ -287,14 +287,14 @@ in actionsfile default.action # Main actions file actionsfile user.action # User customizations filterfile default.filter - + # Don't log interesting things, only startup messages, warnings and errors logfile logfile #jarfile jarfile #debug 0 # show each GET/POST/CONNECT request debug 4096 # Startup banner and warnings debug 8192 # Errors - *we highly recommended enabling this* - + user-manual ${privoxy}/doc/privoxy/user-manual listen-address ${cfg.client.privoxy.listenAddress} toggle 1 @@ -302,10 +302,10 @@ in enable-edit-actions 0 enable-remote-http-toggle 0 buffer-limit 4096 - + # Extra config goes here ''; - + }); - + } |