From 872c75a4255508ce24a0777e4fbfe744a77d1d30 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 16 Jul 2017 15:16:45 +0200
Subject: ma: move torrent secrets to source.nix

---
 makefu/1systems/gum/source.nix       |  1 +
 makefu/1systems/x/config.nix         |  1 +
 makefu/1systems/x/source.nix         |  1 +
 makefu/2configs/torrent.nix          |  5 -----
 makefu/2configs/unstable-sources.nix |  8 --------
 makefu/source.nix                    | 10 +++++++---
 6 files changed, 10 insertions(+), 16 deletions(-)
 delete mode 100644 makefu/2configs/unstable-sources.nix

diff --git a/makefu/1systems/gum/source.nix b/makefu/1systems/gum/source.nix
index 82d42b496..b3ce743ca 100644
--- a/makefu/1systems/gum/source.nix
+++ b/makefu/1systems/gum/source.nix
@@ -1,3 +1,4 @@
 import <stockholm/makefu/source.nix> {
   name="gum";
+  torrent = true;
 }
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index 2dd232193..80c09df1c 100644
--- a/makefu/1systems/x/config.nix
+++ b/makefu/1systems/x/config.nix
@@ -19,6 +19,7 @@ with import <stockholm/lib>;
       # <stockholm/makefu/2configs/disable_v6.nix>
 
       # Testing
+      # <stockholm/makefu/2configs/torrent.nix>
       # <stockholm/makefu/2configs/lanparty/lancache.nix>
       # <stockholm/makefu/2configs/lanparty/lancache-dns.nix>
       # <stockholm/makefu/2configs/deployment/dirctator.nix>
diff --git a/makefu/1systems/x/source.nix b/makefu/1systems/x/source.nix
index 54ec3c8a9..6dc17b656 100644
--- a/makefu/1systems/x/source.nix
+++ b/makefu/1systems/x/source.nix
@@ -1,4 +1,5 @@
 import <stockholm/makefu/source.nix> {
   name="x";
   full = true;
+  # torrent = true;
 }
diff --git a/makefu/2configs/torrent.nix b/makefu/2configs/torrent.nix
index 85d2e6c67..d063ad3e3 100644
--- a/makefu/2configs/torrent.nix
+++ b/makefu/2configs/torrent.nix
@@ -10,11 +10,6 @@ let
   daemon-port = 58846;
   dl-dir = config.makefu.dl-dir;
 in {
-  # prepare secrets
-  krebs.build.source.torrent-secrets.file =
-    if getEnv "dummy_secrets" == "true"
-    then toString <stockholm/makefu/6tests/data/secrets>
-    else config.makefu.torrent-secrets ;
 
   users.users = {
     download = {
diff --git a/makefu/2configs/unstable-sources.nix b/makefu/2configs/unstable-sources.nix
deleted file mode 100644
index a34377683..000000000
--- a/makefu/2configs/unstable-sources.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-_:
-
-{
-  krebs.build.source.nixpkgs = {
-      url = https://github.com/makefu/nixpkgs;
-      rev = "15b5bbfbd1c8a55e7d9e05dd9058dc102fac04fe"; # cherry-picked collectd
-    };
-}
diff --git a/makefu/source.nix b/makefu/source.nix
index a24af4dfb..586b9c22e 100644
--- a/makefu/source.nix
+++ b/makefu/source.nix
@@ -1,5 +1,5 @@
 with import <stockholm/lib>;
-host@{ name, secure ? false, override ? {}, full ? false }: let
+host@{ name, secure ? false, override ? {}, full ? false, torrent ? false }: let
   builder = if getEnv "dummy_secrets" == "true"
               then "buildbot"
               else "makefu";
@@ -29,10 +29,14 @@ in
         buildbot = toString <stockholm/makefu/6tests/data/secrets>;
         makefu = "/home/makefu/secrets/${name}";
       };
+
       stockholm.file = toString <stockholm>;
     }
-    (mkIf (builder == "makefu") {
-      secrets-common.file = "/home/makefu/secrets/common";
+    (mkIf ( torrent ) {
+      torrent-secrets.file = getAttr builder {
+        buildbot = toString <stockholm/makefu/6tests/data/secrets>;
+        makefu = "/home/makefu/secrets/torrent" ;
+      };
     })
     override
   ]
-- 
cgit v1.2.3