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

Merge remote-tracking branch 'gum/master'

Browse Source
This commit is contained in:
lassulus 2017-07-18 17:43:39 +02:00
commit 714cdec79c
4 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
krebs/3modules/makefu/default.nix
View File

@ -410,7 +410,7 @@ with import <stockholm/lib>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPTBGboU/P00yYiwYje53G0oqDFWmcSJ+hIpMsl4f/HH"; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPTBGboU/P00yYiwYje53G0oqDFWmcSJ+hIpMsl4f/HH";
}; };
wbob = rec { wbob = rec {
cores = 1; cores = 4;
nets = { nets = {
siem = { siem = {
ip4.addr = "10.8.10.7"; ip4.addr = "10.8.10.7";

7
makefu/1systems/vbob/source.nix
View File

@ -1,7 +1,4 @@
import <stockholm/makefu/source.nix> { import <stockholm/makefu/source.nix> {
name="studio"; name="vbob";
override.musnix.git = { musnix = true;
url = https://github.com/musnix/musnix.git;
ref = "d8b989f";
};
} }

7
makefu/1systems/wbob/source.nix
View File

@ -1,7 +1,4 @@
import <stockholm/makefu/source.nix> { import <stockholm/makefu/source.nix> {
name="studio"; name="wbob";
override.musnix.git = { musnix = true;
url = https://github.com/musnix/musnix.git;
ref = "d8b989f";
};
} }

17
makefu/source.nix
View File

@ -1,10 +1,17 @@
with import <stockholm/lib>; with import <stockholm/lib>;
host@{ name, secure ? false, override ? {}, full ? false, torrent ? false }: let host@{ name,
override ? {},
secure ? false,
full ? false,
torrent ? false,
musnix ? false
}:
let
builder = if getEnv "dummy_secrets" == "true" builder = if getEnv "dummy_secrets" == "true"
then "buildbot" then "buildbot"
else "makefu"; else "makefu";
_file = <stockholm> + "/makefu/1systems/${name}/source.nix"; _file = <stockholm> + "/makefu/1systems/${name}/source.nix";
ref = "0751450"; # unstable @ 2017-07-16 + graceful requests2 (a772c3aa) ref = "74b40c3"; # unstable @ 2017-07-16 + graceful requests2 (a772c3aa) + libpurple bitlbee
in in
evalSource (toString _file) [ evalSource (toString _file) [
@ -32,6 +39,12 @@ in
stockholm.file = toString <stockholm>; stockholm.file = toString <stockholm>;
} }
(mkIf ( musnix ) {
musnix.git = {
url = https://github.com/musnix/musnix.git;
ref = "d8b989f";
};
})
(mkIf ( torrent ) { (mkIf ( torrent ) {
torrent-secrets.file = getAttr builder { torrent-secrets.file = getAttr builder {
buildbot = toString <stockholm/makefu/6tests/data/secrets>; buildbot = toString <stockholm/makefu/6tests/data/secrets>;