Merge remote-tracking branch 'cd/master'

This commit is contained in:
lassulus 2016-10-16 12:58:46 +02:00
commit cbd83bb95f
2 changed files with 3 additions and 0 deletions
krebs/3modules

View file

@ -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 = {

View file

@ -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" ;