Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

m 3 rtorrent -> k 3 rtorrent

Browse Source
This commit is contained in:
makefu 2016-08-24 17:51:22 +02:00
parent 938e21973a
commit 11797ea564
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
6 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
krebs/3modules/default.nix
View File

@ -33,6 +33,7 @@ let
./realwallpaper.nix ./realwallpaper.nix
./retiolum-bootstrap.nix ./retiolum-bootstrap.nix
./retiolum.nix ./retiolum.nix
./rtorrent.nix
./secret.nix ./secret.nix
./setuid.nix ./setuid.nix
./tinc_graphs.nix ./tinc_graphs.nix

12
makefu/3modules/rtorrent.nix → krebs/3modules/rtorrent.nix
View File

@ -2,9 +2,9 @@
with config.krebs.lib; with config.krebs.lib;
let let
cfg = config.makefu.rtorrent; cfg = config.krebs.rtorrent;
webcfg = config.makefu.rtorrent.web; webcfg = config.krebs.rtorrent.web;
rucfg = config.makefu.rtorrent.rutorrent; rucfg = config.krebs.rtorrent.rutorrent;
nginx-user = config.services.nginx.user; nginx-user = config.services.nginx.user;
nginx-group = config.services.nginx.group; nginx-group = config.services.nginx.group;
@ -55,7 +55,7 @@ let
''; '';
out = { out = {
options.makefu.rtorrent = api; options.krebs.rtorrent = api;
# This only works because none of the attrsets returns the same key # This only works because none of the attrsets returns the same key
config = with lib; mkIf cfg.enable (lib.mkMerge [ config = with lib; mkIf cfg.enable (lib.mkMerge [
(lib.mkIf webcfg.enable rpcweb-imp) (lib.mkIf webcfg.enable rpcweb-imp)
@ -184,8 +184,8 @@ let
see ${cfg.package}/share/doc/rtorrent/rtorrent.rc see ${cfg.package}/share/doc/rtorrent/rtorrent.rc
''; '';
example = literalExample '' example = literalExample ''
log.execute = ${config.makefu.rtorrent.workDir}/execute.log log.execute = ${cfg.workDir}/execute.log
log.xmlrpc = ${config.makefu.rtorrent.workDir}/xmlrpc.log log.xmlrpc = ${cfg.workDir}/xmlrpc.log
''; '';
default = ""; default = "";
}; };

0
makefu/5pkgs/rutorrent/default.nix → krebs/5pkgs/rutorrent/default.nix
View File

2
makefu/2configs/torrent.nix
View File

@ -49,7 +49,7 @@ in {
}; };
}; };
makefu.rtorrent = { krebs.rtorrent = {
enable = true; enable = true;
web = { web = {
enable = true; enable = true;

1
makefu/3modules/default.nix
View File

@ -8,7 +8,6 @@ _:
./forward-journal.nix ./forward-journal.nix
./opentracker.nix ./opentracker.nix
./ps3netsrv.nix ./ps3netsrv.nix
./rtorrent.nix
./snapraid.nix ./snapraid.nix
./taskserver.nix ./taskserver.nix
./udpt.nix ./udpt.nix

1
makefu/5pkgs/default.nix
View File

@ -18,7 +18,6 @@ in
mycube-flask = callPackage ./mycube-flask {}; mycube-flask = callPackage ./mycube-flask {};
nodemcu-uploader = callPackage ./nodemcu-uploader {}; nodemcu-uploader = callPackage ./nodemcu-uploader {};
ps3netsrv = callPackage ./ps3netsrv {}; ps3netsrv = callPackage ./ps3netsrv {};
rutorrent = callPackage ./rutorrent {};
tw-upload-plugin = callPackage ./tw-upload-plugin {}; tw-upload-plugin = callPackage ./tw-upload-plugin {};
skytraq-logger = callPackage ./skytraq-logger {}; skytraq-logger = callPackage ./skytraq-logger {};
taskserver = callPackage ./taskserver {}; taskserver = callPackage ./taskserver {};