diff options
author | makefu <github@syntax-fehler.de> | 2018-10-21 23:20:19 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2018-10-21 23:20:19 +0200 |
commit | d1fd09eec9596fd6bf598692d0cf2a8d2814d169 (patch) | |
tree | dd2556b04d4a3b366b9b60d3e8cccbe0d9717b02 /2configs/torrent.nix | |
parent | 392bd5468c51c1b1f2d25987d8183dda0fe49423 (diff) |
ma torrent: add state, torrent.<hostname>.r
Diffstat (limited to '2configs/torrent.nix')
-rw-r--r-- | 2configs/torrent.nix | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/2configs/torrent.nix b/2configs/torrent.nix index 3df0ddbfe..ca368dbf0 100644 --- a/2configs/torrent.nix +++ b/2configs/torrent.nix @@ -3,12 +3,11 @@ with import <stockholm/lib>; let - daemon-user = "tor"; basicAuth = import <torrent-secrets/auth.nix>; peer-port = 51412; web-port = 8112; daemon-port = 58846; - base-dir = config.makefu.dl-dir; + base-dir = config.krebs.rtorrent.workDir; in { users.users = { @@ -23,17 +22,6 @@ in { }; }; - # todo: race condition, do this after download user has been created - system.activationScripts."download-dir-chmod" = '' - for i in finished watch; do - if test ! -d $i;then - mkdir -p "${base-dir}/$i" - chown rtorrent:download "${base-dir}/$i" - chmod 775 "${base-dir}/$i" - fi - done - ''; - users.extraGroups = { download = { gid = lib.mkDefault (genid "download"); @@ -57,15 +45,17 @@ in { rutorrent.enable = true; enableXMLRPC = true; listenPort = peer-port; - downloadDir = base-dir + "/finished"; - watchDir = base-dir + "/watch"; + downloadDir = config.makefu.dl-dir; # dump old torrents into watch folder to have them re-added }; + services.nginx.virtualHosts."torrent.${config.krebs.build.host.name}.r".locations."/" = { proxyPass = "http://localhost:${toString web-port}/"; }; + networking.firewall.extraCommands = '' iptables -A INPUT -i retiolum -p tcp --dport ${toString web-port} -j ACCEPT ''; networking.firewall.allowedTCPPorts = [ peer-port ]; networking.firewall.allowedUDPPorts = [ peer-port ]; + state = [ config.krebs.rtorrent.sessionDir ]; # state which torrents were loaded } |