commit 9225af50d031aea9ec7a43453e5958ade6e64545 · pyrox.dev/nixpkgs

+26 -5
nixos/modules/services/security/torsocks.nix
···

       6
       6
        
         cfg = config.services.tor.torsocks;

     

       7
       7
        
         optionalNullStr = b: v: optionalString (b != null) v;

     

       8
       8
        
       

     

       9
       9
       -
         configFile = ''

     

       10
       10
       -
           TorAddress ${toString (head (splitString ":" cfg.server))}

     

       11
       11
       -
           TorPort    ${toString (tail (splitString ":" cfg.server))}

     

       9
       9
       +
         configFile = server: ''

     

       10
       10
       +
           TorAddress ${toString (head (splitString ":" server))}

     

       11
       11
       +
           TorPort    ${toString (tail (splitString ":" server))}

     

       12
       12
        
       

     

       13
       13
        
           OnionAddrRange ${cfg.onionAddrRange}

     

       14
       14
        
       

     
···

       19
       19
        
       

     

       20
       20
        
           AllowInbound ${if cfg.allowInbound then "1" else "0"}

     

       21
       21
        
         '';

     

       22
       22
       +
       

     

       23
       23
       +
         wrapTorsocks = name: server: pkgs.writeTextFile {

     

       24
       24
       +
           name = name;

     

       25
       25
       +
           text = ''

     

       26
       26
       +
               #!${pkgs.stdenv.shell}

     

       27
       27
       +
               TORSOCKS_CONF_FILE=${pkgs.writeText "torsocks.conf" (configFile server)} ${pkgs.torsocks}/bin/torsocks "$@"

     

       28
       28
       +
           '';

     

       29
       29
       +
           executable = true;

     

       30
       30
       +
           destination = "/bin/${name}";

     

       31
       31
       +
         };

     

       32
       32
       +
       

     

       22
       33
        
       in

     

       23
       34
        
       {

     

       24
       35
        
         options = {

     
···

       39
       50
        
               description = ''

     

       40
       51
        
                 IP/Port of the Tor SOCKS server. Currently, hostnames are

     

       41
       52
        
                 NOT supported by torsocks.

     

       53
       53
       +
               '';

     

       54
       54
       +
             };

     

       55
       55
       +
       

     

       56
       56
       +
             fasterServer = mkOption {

     

       57
       57
       +
               type    = types.str;

     

       58
       58
       +
               default = "127.0.0.1:9063";

     

       59
       59
       +
               example = "192.168.0.20:1234";

     

       60
       60
       +
               description = ''

     

       61
       61
       +
                 IP/Port of the Tor SOCKS server for torsocks-faster wrapper suitable for HTTP.

     

       62
       62
       +
                 Currently, hostnames are NOT supported by torsocks.

     

       42
       63
        
               '';

     

       43
       64
        
             };

     

       44
       65
        
       

     
···

       89
       110
        
         };

     

       90
       111
        
       

     

       91
       112
        
         config = mkIf cfg.enable {

     

       92
       92
       -
           environment.systemPackages = [ pkgs.torsocks ];

     

       113
       113
       +
           environment.systemPackages = [ pkgs.torsocks (wrapTorsocks "torsocks-faster" cfg.fasterServer) ];

     

       93
       114
        
       

     

       94
       115
        
           environment.etc =

     

       95
       95
       -
             [ { source = pkgs.writeText "torsocks.conf" configFile;

     

       116
       116
       +
             [ { source = pkgs.writeText "torsocks.conf" (configFile cfg.server);

     

       96
       117
        
                 target = "tor/torsocks.conf";

     

       97
       118
        
               }

     

       98
       119
        
             ];