@ -107,6 +107,9 @@ let
in
in
{
{
imports = [
imports = [
( mkRemovedOptionModule [ " s e r v i c e s " " t o r " " c l i e n t " " p r i v o x y " " e n a b l e " ] ''
Use services . privoxy . enable and services . privoxy . enableTor instead .
'' )
( mkRenamedOptionModule [ " s e r v i c e s " " t o r " " r e l a y " " p o r t S p e c " ] [ " s e r v i c e s " " t o r " " r e l a y " " p o r t " ] )
( mkRenamedOptionModule [ " s e r v i c e s " " t o r " " r e l a y " " p o r t S p e c " ] [ " s e r v i c e s " " t o r " " r e l a y " " p o r t " ] )
( mkRemovedOptionModule [ " s e r v i c e s " " t o r " " r e l a y " " i s B r i d g e " ] " U s e s e r v i c e s . t o r . r e l a y . r o l e i n s t e a d . " )
( mkRemovedOptionModule [ " s e r v i c e s " " t o r " " r e l a y " " i s B r i d g e " ] " U s e s e r v i c e s . t o r . r e l a y . r o l e i n s t e a d . " )
( mkRemovedOptionModule [ " s e r v i c e s " " t o r " " r e l a y " " i s E x i t " ] " U s e s e r v i c e s . t o r . r e l a y . r o l e i n s t e a d . " )
( mkRemovedOptionModule [ " s e r v i c e s " " t o r " " r e l a y " " i s E x i t " ] " U s e s e r v i c e s . t o r . r e l a y . r o l e i n s t e a d . " )
@ -270,23 +273,6 @@ in
description = " L i s t o f s u f f i x e s t o u s e w i t h a u t o m a p H o s t s O n R e s o l v e " ;
description = " L i s t o f s u f f i x e s t o u s e w i t h a u t o m a p H o s t s O n R e s o l v e " ;
} ;
} ;
} ;
} ;
privoxy . enable = mkOption {
type = types . bool ;
default = true ;
description = ''
Whether to enable and configure the system Privoxy to use Tor's
faster port , suitable for HTTP .
To have anonymity , protocols need to be scrubbed of identifying
information , and this can be accomplished for HTTP by Privoxy .
Privoxy can also be useful for KDE torification . A good setup would be :
setting SOCKS proxy to the default Tor port , providing maximum
circuit isolation where possible ; and setting HTTP proxy to Privoxy
to route HTTP traffic over faster , but less isolated port .
'' ;
} ;
} ;
} ;
relay = {
relay = {
@ -784,16 +770,5 @@ in
} ;
} ;
environment . systemPackages = [ cfg . package ] ;
environment . systemPackages = [ cfg . package ] ;
services . privoxy = mkIf ( cfg . client . enable && cfg . client . privoxy . enable ) {
enable = true ;
extraConfig = ''
forward-socks4a / $ { cfg . client . socksListenAddressFaster } .
toggle 1
enable-remote-toggle 0
enable-edit-actions 0
enable-remote-http-toggle 0
'' ;
} ;
} ;
} ;
}
}