summaryrefslogtreecommitdiffstats
path: root/makefu/2configs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-08-24 12:16:18 +0200
committermakefu <github@syntax-fehler.de>2016-08-24 12:16:18 +0200
commit73e09d94ead92e0c4085b96015aca68558382767 (patch)
tree4b99908e586f8585087eb5d321aabaa4b2a9452e /makefu/2configs
parent07bea34ab27bc52b8a002335c5590cd29542b32b (diff)
m 2 torrent: use rtorrent by default
Diffstat (limited to 'makefu/2configs')
-rw-r--r--makefu/2configs/torrent.nix44
1 files changed, 18 insertions, 26 deletions
diff --git a/makefu/2configs/torrent.nix b/makefu/2configs/torrent.nix
index 09f3ca059..1c9b054d6 100644
--- a/makefu/2configs/torrent.nix
+++ b/makefu/2configs/torrent.nix
@@ -4,7 +4,7 @@ with config.krebs.lib;
let
daemon-user = "tor";
- daemon-pw = (import <torrent-secrets/daemon-pw>);
+ authfile = <torrent-secrets/authfile>;
peer-port = 51412;
web-port = 8112;
daemon-port = 58846;
@@ -27,9 +27,10 @@ in {
openssh.authorizedKeys.keys = [ ];
};
};
+
# todo: race condition, do this after download user has been created
system.activationScripts."download-dir-chmod" = ''
- for i in finished torrents; do
+ for i in finished watch torrents; do
mkdir -p "${dl-dir}/$i"
chown download:download "${dl-dir}/$i"
chmod 770 "${dl-dir}/$i"
@@ -42,39 +43,30 @@ in {
members = [
config.krebs.build.user.name
"download"
- "deluge"
+ "rtorrent"
+ "nginx"
];
};
};
- makefu.deluge = {
+ makefu.rtorrent = {
enable = true;
- auth = "${daemon-user}:${daemon-pw}:10";
- # web.enable = true;
- cfg = {
- autoadd_enable = true;
- download_location = dl-dir + "/finished";
- torrentfiles_location = dl-dir + "/torrents"; copy_torrent_file = 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 ];
- # performance tuning
- cache_expiry = 3600;
- stop_seed_at_ratio = false;
+ web = {
+ enable = true;
+ enableAuth = true;
+ listenAddress = toString web-port;
+ inherit authfile;
};
+ rutorrent.enable = true;
+ enableXMLRPC = true;
+ listenPort = peer-port;
+ downloadDir = dl-dir + "/finished";
+ # dump old torrents into watch folder to have them re-added
+ watchDir = dl-dir +"/watch";
};
networking.firewall.extraCommands = ''
- iptables -A INPUT -i retiolum -p tcp --dport ${toString daemon-port} -j ACCEPT
+ iptables -A INPUT -i retiolum -p tcp --dport ${toString web-port} -j ACCEPT
'';
networking.firewall.allowedTCPPorts = [ peer-port ];