summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-05-24 01:31:22 +0200
committertv <tv@krebsco.de>2017-05-24 01:31:22 +0200
commit46d6506916f699e3b707dc41cd68c92b98e50e5a (patch)
tree1d43d0072fc479c7022e3cd3b9810aa7b90e1db3 /krebs
parent061e702a6fc0e6046d39c3975c9034a69499c45f (diff)
parent90f6d9f228029233d38a86a520a0e532cc5e499f (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs')
-rw-r--r--krebs/3modules/lass/default.nix8
1 files changed, 7 insertions, 1 deletions
diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix
index b86e05319..0e1cbd876 100644
--- a/krebs/3modules/lass/default.nix
+++ b/krebs/3modules/lass/default.nix
@@ -3,7 +3,10 @@
with import <stockholm/lib>;
{
- hosts = mapAttrs (_: setAttr "owner" config.krebs.users.lass) {
+ hosts = mapAttrs (_: recursiveUpdate {
+ owner = config.krebs.users.lass;
+ managed = true;
+ }) {
dishfire = {
cores = 4;
nets = rec {
@@ -124,6 +127,7 @@ with import <stockholm/lib>;
ssh.port = 2223;
};
};
+ managed = false;
};
cloudkrebs = {
cores = 1;
@@ -300,6 +304,7 @@ with import <stockholm/lib>;
};
iso = {
cores = 1;
+ managed = false;
};
sokrateslaptop = {
nets = {
@@ -321,6 +326,7 @@ with import <stockholm/lib>;
'';
};
};
+ managed = false;
};
};
users = {