diff options
| author | lassulus <lass@aidsballs.de> | 2016-10-16 12:58:46 +0200 | 
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-10-16 12:58:46 +0200 | 
| commit | cbd83bb95fb3b4443523cc277b662ce4dd9d5925 (patch) | |
| tree | fea9abe44af457fb5b1d425abc4b2450bd5a35e1 | |
| parent | 52f50275651f0c762b7f9712cd6cc31077950421 (diff) | |
| parent | ce58a50de30fd49d4c000a81f9b7ce9baf0ccd66 (diff) | |
Merge remote-tracking branch 'cd/master'
| -rw-r--r-- | krebs/3modules/makefu/default.nix | 1 | ||||
| -rw-r--r-- | krebs/3modules/shared/default.nix | 2 | 
2 files changed, 3 insertions, 0 deletions
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index de5be964f..f5190b6ba 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -791,6 +791,7 @@ TNs2RYfwDy/r6H/hDeB/BSngPouedEVcPwIDAQAB    } // { # hosts only maintained in stockholm, not owned by me      muhbaasu = rec { +      owner = config.krebs.users.root;        cores = 1;        nets = {          internet = { diff --git a/krebs/3modules/shared/default.nix b/krebs/3modules/shared/default.nix index 47767d370..a9868954e 100644 --- a/krebs/3modules/shared/default.nix +++ b/krebs/3modules/shared/default.nix @@ -8,6 +8,7 @@ let      "test-centos7"      "test-all-krebs-modules"    ] (name: { +    owner = config.krebs.users.shared;      inherit name;      cores = 1;      nets = { @@ -34,6 +35,7 @@ let  in {    hosts = {      wolf = { +      owner = config.krebs.users.shared;        nets = {          shack = {            ip4.addr =  "10.42.2.150" ;  | 
