m 3 rtorrent -> k 3 rtorrent

6 files changed, 8 insertions, 9 deletions

diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 17eae1778..a4a5f9cad 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -33,6 +33,7 @@ let
       ./realwallpaper.nix
       ./retiolum-bootstrap.nix
       ./retiolum.nix
+      ./rtorrent.nix
       ./secret.nix
       ./setuid.nix
       ./tinc_graphs.nix
diff --git a/makefu/3modules/rtorrent.nix b/krebs/3modules/rtorrent.nix
index d6e22a08d..3ab23ec5e 100644
--- a/makefu/3modules/rtorrent.nix
+++ b/krebs/3modules/rtorrent.nix
@@ -2,9 +2,9 @@
 
 with config.krebs.lib;
 let
-  cfg = config.makefu.rtorrent;
-  webcfg = config.makefu.rtorrent.web;
-  rucfg = config.makefu.rtorrent.rutorrent;
+  cfg = config.krebs.rtorrent;
+  webcfg = config.krebs.rtorrent.web;
+  rucfg = config.krebs.rtorrent.rutorrent;
 
   nginx-user = config.services.nginx.user;
   nginx-group = config.services.nginx.group;
@@ -55,7 +55,7 @@ let
   '';
 
   out = {
-    options.makefu.rtorrent = api;
+    options.krebs.rtorrent = api;
     # This only works because none of the attrsets returns the same key
     config = with lib; mkIf cfg.enable (lib.mkMerge [
       (lib.mkIf webcfg.enable rpcweb-imp)
@@ -184,8 +184,8 @@ let
         see ${cfg.package}/share/doc/rtorrent/rtorrent.rc
       '';
       example = literalExample ''
-        log.execute = ${config.makefu.rtorrent.workDir}/execute.log
-        log.xmlrpc = ${config.makefu.rtorrent.workDir}/xmlrpc.log
+        log.execute = ${cfg.workDir}/execute.log
+        log.xmlrpc = ${cfg.workDir}/xmlrpc.log
       '';
       default = "";
     };
diff --git a/makefu/5pkgs/rutorrent/default.nix b/krebs/5pkgs/rutorrent/default.nix
index 5a2259552..5a2259552 100644
--- a/makefu/5pkgs/rutorrent/default.nix
+++ b/krebs/5pkgs/rutorrent/default.nix
diff --git a/makefu/2configs/torrent.nix b/makefu/2configs/torrent.nix
index 1c9b054d6..28f21b659 100644
--- a/makefu/2configs/torrent.nix
+++ b/makefu/2configs/torrent.nix
@@ -49,7 +49,7 @@ in {
     };
   };
 
-  makefu.rtorrent = {
+  krebs.rtorrent = {
     enable = true;
     web = {
       enable = true;
diff --git a/makefu/3modules/default.nix b/makefu/3modules/default.nix
index bddd96aa4..855e134ab 100644
--- a/makefu/3modules/default.nix
+++ b/makefu/3modules/default.nix
@@ -8,7 +8,6 @@ _:
     ./forward-journal.nix
     ./opentracker.nix
     ./ps3netsrv.nix
-    ./rtorrent.nix
     ./snapraid.nix
     ./taskserver.nix
     ./udpt.nix
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index eaa916f94..51987c35b 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -18,7 +18,6 @@ in
     mycube-flask = callPackage ./mycube-flask {};
     nodemcu-uploader = callPackage ./nodemcu-uploader {};
     ps3netsrv = callPackage ./ps3netsrv {};
-    rutorrent = callPackage ./rutorrent {};
     tw-upload-plugin = callPackage ./tw-upload-plugin {};
     skytraq-logger = callPackage ./skytraq-logger {};
     taskserver = callPackage ./taskserver {};