@@ -107,6 +107,9 @@ let
107107in
108108{
109109 imports = [
110+ (mkRemovedOptionModule [ "services" "tor" "client" "privoxy" "enable" ] ''
111+ Use services.privoxy.enable and services.privoxy.enableTor instead.
112+ '')
110113 (mkRenamedOptionModule [ "services" "tor" "relay" "portSpec" ] [ "services" "tor" "relay" "port" ])
111114 (mkRemovedOptionModule [ "services" "tor" "relay" "isBridge" ] "Use services.tor.relay.role instead.")
112115 (mkRemovedOptionModule [ "services" "tor" "relay" "isExit" ] "Use services.tor.relay.role instead.")
@@ -270,23 +273,6 @@ in
270273 description = "List of suffixes to use with automapHostsOnResolve";
271274 };
272275 };
273−
274− privoxy.enable = mkOption {
275− type = types.bool;
276− default = true;
277− description = ''
278− Whether to enable and configure the system Privoxy to use Tor's
279− faster port, suitable for HTTP.
280−
281− To have anonymity, protocols need to be scrubbed of identifying
282− information, and this can be accomplished for HTTP by Privoxy.
283−
284− Privoxy can also be useful for KDE torification. A good setup would be:
285− setting SOCKS proxy to the default Tor port, providing maximum
286− circuit isolation where possible; and setting HTTP proxy to Privoxy
287− to route HTTP traffic over faster, but less isolated port.
288− '';
289− };
290276 };
291277
292278 relay = {
@@ -784,16 +770,5 @@ in
784770 };
785771
786772 environment.systemPackages = [ cfg.package ];
787−
788− services.privoxy = mkIf (cfg.client.enable && cfg.client.privoxy.enable) {
789− enable = true;
790− extraConfig = ''
791− forward-socks4a / ${cfg.client.socksListenAddressFaster} .
792− toggle 1
793− enable-remote-toggle 0
794− enable-edit-actions 0
795− enable-remote-http-toggle 0
796− '';
797− };
798773 };
799774}