Merge remote-tracking branch 'gum/22.05'

2 files changed, 53 insertions, 9 deletions

diff --git a/makefu/2configs/torrent/deluge.nix b/makefu/2configs/torrent/deluge.nix
new file mode 100644
index 000000000..af965fbe9
--- /dev/null
+++ b/makefu/2configs/torrent/deluge.nix
@@ -0,0 +1,42 @@
+{ config, pkgs, ... }:
+let
+  base = config.makefu.dl-dir;
+  daemon-port = 58846;
+  peer-port = 51412;
+  web-port = 8112;
+  secfile = toString <torrent-secrets> + "/deluge-auth";
+  authfile = config.services.deluge.dataDir + "/myauth";
+in {
+  services.deluge = {
+    enable = true;
+    package = pkgs.deluge-2_x;
+    openFilesLimit = 65355;
+    declarative = true;
+    config = {
+      download_location = base + "/finished";
+      allow_remote = true;
+      inherit daemon-port;
+      listen_ports = [ peer-port ];
+      copy_torrent_file = true;
+      torrentfiles_location = base + "/torrents";
+      max_active_seeding = 50;
+      max_connections_global = 1000;
+      max_half_open_connections = 200;
+      enabled_plugins = [ "AutoAdd" ];
+    };
+    openFirewall = true;
+    group = "download";
+    authFile = authfile;
+    web = {
+      enable = true;
+      port = web-port;
+    };
+  };
+
+  #systemd.services.deluged.serviceConfig.ExecStartPre = pkgs.writeDash "install-auth" ''
+  #  install -odeluge "$secfile" "$authfile"
+  #'';
+  services.nginx.enable = true;
+  services.nginx.virtualHosts."torrent.${config.krebs.build.host.name}.r".locations."/" = { proxyPass = "http://localhost:${toString web-port}/"; };
+  state = [ "/var/lib/deluge/.config/deluge" ];
+}
diff --git a/makefu/2configs/torrent/rtorrent.nix b/makefu/2configs/torrent/rtorrent.nix
index 79325bfc7..87ecc1e19 100644
--- a/makefu/2configs/torrent/rtorrent.nix
+++ b/makefu/2configs/torrent/rtorrent.nix
@@ -7,15 +7,17 @@ let
   daemon-port = 58846;
   dldir = config.makefu.dl-dir;
 in {
-  services.rtorrent.enable = true;
-  services.rtorrent.user = "rtorrent";
-  services.rtorrent.group = "download";
-  services.rtorrent.downloadDir = dldir;
-  services.rtorrent.configText = ''
-    schedule2 = watch_start, 10, 10, ((load.start, (cat, (cfg.watch), "/media/cloud/watch/*.torrent")))
-  '';
-
-  services.rtorrent.openFirewall = true;
+  services.rtorrent = {
+    enable = true;
+    user = "rtorrent";
+    port = peer-port;
+    openFirewall = true;
+    group = "download";
+    downloadDir = dldir;
+    configText = ''
+      schedule2 = watch_start, 10, 10, ((load.start, (cat, (cfg.watch), "/media/cloud/watch/*.torrent")))
+    '';
+  };
 
   systemd.services.flood = {
     wantedBy = [ "multi-user.target" ];