From 910103246fd2805d083bc78a7a68cb6447c86709 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Wed, 22 Sep 2010 23:07:59 +0000
Subject: [PATCH] TOR: make torify work(only when enabled as a service. nix-env
 -i tor replaces it with a broken version.)

svn path=/nixos/trunk/; revision=23905
---
 modules/module-list.nix              |  1 +
 modules/services/security/tor.nix    |  1 -
 modules/services/security/torify.nix | 69 ++++++++++++++++++++++++++++
 3 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 modules/services/security/torify.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 9113d249ae86..71ba9d06e24c 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -111,6 +111,7 @@
   ./services/scheduling/cron.nix
   ./services/scheduling/fcron.nix
   ./services/security/tor.nix
+  ./services/security/torify.nix
   ./services/system/dbus.nix
   ./services/system/kerberos.nix
   ./services/system/nscd.nix
diff --git a/modules/services/security/tor.nix b/modules/services/security/tor.nix
index 943c4c9274e7..8ddc468aa389 100644
--- a/modules/services/security/tor.nix
+++ b/modules/services/security/tor.nix
@@ -219,7 +219,6 @@ in
   ###### implementation
 
   config = mkIf (cfg.client.enable || cfg.relay.enable) {
-    environment.systemPackages = [ tor ];  # provides tor-resolve and torify
 
     assertions = [ {
       assertion = cfg.relay.enable -> !(cfg.relay.isBridge && cfg.relay.isExit);
diff --git a/modules/services/security/torify.nix b/modules/services/security/torify.nix
new file mode 100644
index 000000000000..b91d7d58505c
--- /dev/null
+++ b/modules/services/security/torify.nix
@@ -0,0 +1,69 @@
+{ config, pkgs, ... }:
+with pkgs.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
+    '';
+  };
+
+}
\ No newline at end of file