diff options
| author | Austin Seipp <aseipp@pobox.com> | 2014-12-05 22:23:55 -0600 |
|---|---|---|
| committer | Austin Seipp <aseipp@pobox.com> | 2014-12-06 05:00:26 -0600 |
| commit | 1b26faeb6994151b8f8842f340fe4c1b820f09fb (patch) | |
| tree | 95c2d90e10b6166425f2fa5c26f0f955b61abd66 /nixos | |
| parent | 47eabfabe2e09a7a789510a27cab306b84c47ab8 (diff) | |
| download | nixpkgs-1b26faeb6994151b8f8842f340fe4c1b820f09fb.tar nixpkgs-1b26faeb6994151b8f8842f340fe4c1b820f09fb.tar.gz nixpkgs-1b26faeb6994151b8f8842f340fe4c1b820f09fb.tar.bz2 nixpkgs-1b26faeb6994151b8f8842f340fe4c1b820f09fb.tar.lz nixpkgs-1b26faeb6994151b8f8842f340fe4c1b820f09fb.tar.xz nixpkgs-1b26faeb6994151b8f8842f340fe4c1b820f09fb.tar.zst nixpkgs-1b26faeb6994151b8f8842f340fe4c1b820f09fb.zip | |
nixos: Remove torify module
'torify' now ships with the tor bundle itself; and using torsocks is recommended over tsocks (torify will use torsocks automatically.) Signed-off-by: Austin Seipp <aseipp@pobox.com>
Diffstat (limited to 'nixos')
| -rwxr-xr-x | nixos/modules/module-list.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/security/torify.nix | 69 |
2 files changed, 0 insertions, 70 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 5bd056e5bc9..77a9f97d5a5 100755 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -302,7 +302,6 @@ ./services/security/fprot.nix ./services/security/frandom.nix ./services/security/haveged.nix - ./services/security/torify.nix ./services/security/tor.nix ./services/security/torsocks.nix ./services/system/dbus.nix diff --git a/nixos/modules/services/security/torify.nix b/nixos/modules/services/security/torify.nix deleted file mode 100644 index 53f48a714b4..00000000000 --- a/nixos/modules/services/security/torify.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ config, lib, pkgs, ... }: -with lib; -let - - cfg = config.services.tor; - - torify = pkgs.writeTextFile { - name = "torify"; - text = '' - #!${pkgs.stdenv.shell} - TSOCKS_CONF_FILE=${pkgs.writeText "tsocks.conf" cfg.torify.config} LD_PRELOAD="${pkgs.tsocks}/lib/libtsocks.so $LD_PRELOAD" "$@" - ''; - executable = true; - destination = "/bin/torify"; - }; - -in - -{ - - ###### interface - - options = { - - services.tor.torify = { - - enable = mkOption { - default = cfg.client.enable; - description = '' - Whether to build torify scipt to relay application traffic via TOR. - ''; - }; - - server = mkOption { - default = "localhost:9050"; - example = "192.168.0.20"; - description = '' - IP address of TOR client to use. - ''; - }; - - config = mkOption { - default = ""; - description = '' - Extra configuration. Contents will be added verbatim to TSocks - configuration file. - ''; - }; - - }; - - }; - - ###### implementation - - config = mkIf cfg.torify.enable { - - environment.systemPackages = [ torify ]; # expose it to the users - - services.tor.torify.config = '' - server = ${toString(head (splitString ":" cfg.torify.server))} - server_port = ${toString(tail (splitString ":" cfg.torify.server))} - - local = 127.0.0.0/255.128.0.0 - local = 127.128.0.0/255.192.0.0 - ''; - }; - -} |