Merge remote-tracking branch 'gum/master'

3 files changed, 42 insertions, 6 deletions

diff --git a/makefu/2configs/opentracker.nix b/makefu/2configs/opentracker.nix
new file mode 100644
index 000000000..f98105625
--- /dev/null
+++ b/makefu/2configs/opentracker.nix
@@ -0,0 +1,16 @@
+{pkgs, ...}:
+
+let
+  daemon-port = 16969;
+  cfgfile = pkgs.writeText "opentracker-cfg" ''
+  '';
+in {
+  # Opentracker does not support local IPs (10.0.0.0/8 )
+  makefu.opentracker = {
+    enable = true;
+    args = "-p ${toString daemon-port} -P ${toString daemon-port}";
+  };
+  networking.firewall.allowedTCPPorts = [ daemon-port ];
+  networking.firewall.allowedUDPPorts = [ daemon-port ];
+
+}
diff --git a/makefu/2configs/rtorrent.nix b/makefu/2configs/rtorrent.nix
new file mode 100644
index 000000000..9e2990cab
--- /dev/null
+++ b/makefu/2configs/rtorrent.nix
@@ -0,0 +1,19 @@
+_:
+let
+  listenPort = 60123;
+  xml-port = 5000;
+  authfile = <torrent-secrets/authfile>;
+in {
+  makefu.rtorrent = {
+    enable = true;
+    web = {
+      enable = true;
+      enableAuth = true;
+      inherit authfile;
+    };
+    rutorrent.enable = true;
+    enableXMLRPC = true;
+    logLevel = "debug";
+    inherit listenPort;
+  };
+}
diff --git a/makefu/2configs/torrent.nix b/makefu/2configs/torrent.nix
index c18db9fa3..09f3ca059 100644
--- a/makefu/2configs/torrent.nix
+++ b/makefu/2configs/torrent.nix
@@ -55,20 +55,21 @@ in {
       autoadd_enable = true;
       download_location = dl-dir + "/finished";
       torrentfiles_location = dl-dir + "/torrents"; copy_torrent_file = true;
-      lsd = true;
-      dht = true;
-      upnp = true;
-      natpmp = true;
+      lsd = false;
+      dht = false;
+      upnp = false;
+      natpmp = false;
       add_paused = false;
       allow_remote = true;
       remove_seed_at_ratio = false;
       move_completed = false;
       daemon_port = daemon-port;
+      random_port = false;
+      random_outgoing_ports = true;
       listen_ports = [ peer-port peer-port ];
-      outgoing_ports = [ peer-port peer-port ];
       # performance tuning
       cache_expiry = 3600;
-      stop_seed_at_ratio = true;
+      stop_seed_at_ratio = false;
     };
   };