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

ma: move torrent secrets to source.nix

Browse Source
This commit is contained in:
makefu 2017-07-16 15:16:45 +02:00
parent 7dbd54880d
commit 872c75a425
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
6 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
makefu/1systems/gum/source.nix
View File

@ -1,3 +1,4 @@
import <stockholm/makefu/source.nix> { import <stockholm/makefu/source.nix> {
name="gum"; name="gum";
torrent = true;
} }

1
makefu/1systems/x/config.nix
View File

@ -19,6 +19,7 @@ with import <stockholm/lib>;
# <stockholm/makefu/2configs/disable_v6.nix> # <stockholm/makefu/2configs/disable_v6.nix>
# Testing # Testing
# <stockholm/makefu/2configs/torrent.nix>
# <stockholm/makefu/2configs/lanparty/lancache.nix> # <stockholm/makefu/2configs/lanparty/lancache.nix>
# <stockholm/makefu/2configs/lanparty/lancache-dns.nix> # <stockholm/makefu/2configs/lanparty/lancache-dns.nix>
# <stockholm/makefu/2configs/deployment/dirctator.nix> # <stockholm/makefu/2configs/deployment/dirctator.nix>

1
makefu/1systems/x/source.nix
View File

@ -1,4 +1,5 @@
import <stockholm/makefu/source.nix> { import <stockholm/makefu/source.nix> {
name="x"; name="x";
full = true; full = true;
# torrent = true;
} }

5
makefu/2configs/torrent.nix
View File

@ -10,11 +10,6 @@ let
daemon-port = 58846; daemon-port = 58846;
dl-dir = config.makefu.dl-dir; dl-dir = config.makefu.dl-dir;
in { 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 = { users.users = {
download = { download = {

8
makefu/2configs/unstable-sources.nix
View File

@ -1,8 +0,0 @@
_:
{
krebs.build.source.nixpkgs = {
url = https://github.com/makefu/nixpkgs;
rev = "15b5bbfbd1c8a55e7d9e05dd9058dc102fac04fe"; # cherry-picked collectd
};
}

10
makefu/source.nix
View File

@ -1,5 +1,5 @@
with import <stockholm/lib>; 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" builder = if getEnv "dummy_secrets" == "true"
then "buildbot" then "buildbot"
else "makefu"; else "makefu";
@ -29,10 +29,14 @@ in
buildbot = toString <stockholm/makefu/6tests/data/secrets>; buildbot = toString <stockholm/makefu/6tests/data/secrets>;
makefu = "/home/makefu/secrets/${name}"; makefu = "/home/makefu/secrets/${name}";
}; };
stockholm.file = toString <stockholm>; stockholm.file = toString <stockholm>;
} }
(mkIf (builder == "makefu") { (mkIf ( torrent ) {
secrets-common.file = "/home/makefu/secrets/common"; torrent-secrets.file = getAttr builder {
buildbot = toString <stockholm/makefu/6tests/data/secrets>;
makefu = "/home/makefu/secrets/torrent" ;
};
}) })
override override
] ]