summaryrefslogtreecommitdiffstats
path: root/makefu/source.nix
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-07-16 15:16:45 +0200
committermakefu <github@syntax-fehler.de>2017-07-16 15:16:45 +0200
commit872c75a4255508ce24a0777e4fbfe744a77d1d30 (patch)
tree189c57fd99cb6a8998681511c8784b5369453f0b /makefu/source.nix
parent7dbd54880de22cbebd95593f643f638551ca62df (diff)
ma: move torrent secrets to source.nix
Diffstat (limited to 'makefu/source.nix')
-rw-r--r--makefu/source.nix10
1 files changed, 7 insertions, 3 deletions
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
]