diff options
| author | lassulus <lassulus@lassul.us> | 2017-09-01 21:52:48 +0200 | 
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-09-01 21:52:48 +0200 | 
| commit | 6bb5eeeb0551deea4532976df5238b888788c94e (patch) | |
| tree | 125201d24bcca4cebacbb046f76ddf2dba0d7492 /krebs | |
| parent | 1234efe72de6912f0a728eaac6c64979a729c973 (diff) | |
| parent | 056b02ed05a38a8a032ad70b4ec092dd07ba6736 (diff) | |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/3modules/mv/default.nix | 1 | ||||
| -rw-r--r-- | krebs/3modules/tv/default.nix | 5 | 
2 files changed, 6 insertions, 0 deletions
diff --git a/krebs/3modules/mv/default.nix b/krebs/3modules/mv/default.nix index 7876ab79e..c8d138a44 100644 --- a/krebs/3modules/mv/default.nix +++ b/krebs/3modules/mv/default.nix @@ -5,6 +5,7 @@ with import <stockholm/lib>;  {    hosts = mapAttrs (_: setAttr "owner" config.krebs.users.mv) {      stro = { +      ci = true;        cores = 4;        nets = {          retiolum = { diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index d6e6eae11..79fa27bad 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -79,6 +79,7 @@ with import <stockholm/lib>;        ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOd/HqZIO9Trn3eycl23GZAz21HQCISaVNfNyaLSQvJ6";      };      ju = { +      external = true;        nets = {          gg23 = {            ip4.addr = "10.23.1.144"; @@ -112,6 +113,7 @@ with import <stockholm/lib>;        ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHM6dL0fQ8Bd0hER0Xa3I2pAWVHdnwOBaAZhbDlLJmUu";      };      kaepsele = { +      external = true;        nets = {          retiolum = {            ip4.addr = "10.243.166.2"; @@ -237,6 +239,7 @@ with import <stockholm/lib>;        ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMIHmwXHV7E9UGuk4voVCADjlLkyygqNw054jvrsPn5t root@nomic";      };      ok = { +      external = true;        nets = {          gg23 = {            ip4.addr = "10.23.1.1"; @@ -245,6 +248,7 @@ with import <stockholm/lib>;        };      };      schnabeldrucker = { +      external = true;        nets = {          gg23 = {            ip4.addr = "10.23.1.21"; @@ -253,6 +257,7 @@ with import <stockholm/lib>;        };      };      schnabelscanner = { +      external = true;        nets = {          gg23 = {            ip4.addr = "10.23.1.22";  | 
