summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2017-07-18 17:43:39 +0200
committerlassulus <lassulus@lassul.us>2017-07-18 17:43:39 +0200
commit714cdec79cf457f304207f443f8b72f64a958d8f (patch)
tree99a3023fe4a10ae93904b14191d7cae5cd9392a9
parent5f743cbd32572a25e0df73b823cd866f1d80f01a (diff)
parentbe49befd5239ab2715992e3103bd71327e5a7310 (diff)
Merge remote-tracking branch 'gum/master'
-rw-r--r--krebs/3modules/makefu/default.nix2
-rw-r--r--makefu/1systems/vbob/source.nix7
-rw-r--r--makefu/1systems/wbob/source.nix7
-rw-r--r--makefu/source.nix17
4 files changed, 20 insertions, 13 deletions
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix
index c517ac1d8..f80c397ee 100644
--- a/krebs/3modules/makefu/default.nix
+++ b/krebs/3modules/makefu/default.nix
@@ -410,7 +410,7 @@ with import <stockholm/lib>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPTBGboU/P00yYiwYje53G0oqDFWmcSJ+hIpMsl4f/HH";
};
wbob = rec {
- cores = 1;
+ cores = 4;
nets = {
siem = {
ip4.addr = "10.8.10.7";
diff --git a/makefu/1systems/vbob/source.nix b/makefu/1systems/vbob/source.nix
index af0f37809..5b726e40b 100644
--- a/makefu/1systems/vbob/source.nix
+++ b/makefu/1systems/vbob/source.nix
@@ -1,7 +1,4 @@
import <stockholm/makefu/source.nix> {
- name="studio";
- override.musnix.git = {
- url = https://github.com/musnix/musnix.git;
- ref = "d8b989f";
- };
+ name="vbob";
+ musnix = true;
}
diff --git a/makefu/1systems/wbob/source.nix b/makefu/1systems/wbob/source.nix
index af0f37809..6f079d712 100644
--- a/makefu/1systems/wbob/source.nix
+++ b/makefu/1systems/wbob/source.nix
@@ -1,7 +1,4 @@
import <stockholm/makefu/source.nix> {
- name="studio";
- override.musnix.git = {
- url = https://github.com/musnix/musnix.git;
- ref = "d8b989f";
- };
+ name="wbob";
+ musnix = true;
}
diff --git a/makefu/source.nix b/makefu/source.nix
index 02ec2c177..ec86e7f77 100644
--- a/makefu/source.nix
+++ b/makefu/source.nix
@@ -1,10 +1,17 @@
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"
then "buildbot"
else "makefu";
_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
evalSource (toString _file) [
@@ -32,6 +39,12 @@ in
stockholm.file = toString <stockholm>;
}
+ (mkIf ( musnix ) {
+ musnix.git = {
+ url = https://github.com/musnix/musnix.git;
+ ref = "d8b989f";
+ };
+ })
(mkIf ( torrent ) {
torrent-secrets.file = getAttr builder {
buildbot = toString <stockholm/makefu/6tests/data/secrets>;