diff options
| author | tv <tv@krebsco.de> | 2016-11-11 08:49:37 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-11-11 08:49:37 +0100 |
| commit | 0e13a4e2373d891e6a895e4b6ad2b42da028ba12 (patch) | |
| tree | 1d8ca040ab86b462d6e3fd283997d56177fa4b33 /lass/1systems | |
| parent | b837dec290e54f532cd5539c93a663ba11f68c54 (diff) | |
| parent | e6c7b13f5990d96e269ee12b9bf6b15bfa7d5b82 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/1systems')
| -rw-r--r-- | lass/1systems/mors.nix | 2 | ||||
| -rw-r--r-- | lass/1systems/prism.nix | 8 | ||||
| -rw-r--r-- | lass/1systems/shodan.nix | 4 |
3 files changed, 13 insertions, 1 deletions
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index c3d027edc..742d42bf8 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -54,7 +54,7 @@ with import <stockholm/lib>; enable = true; package = pkgs.postgresql; }; - #virtualisation.docker.enable = true; + virtualisation.docker.enable = true; #users.users.mainUser.extraGroups = [ "docker" ]; } { diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index 76710ac9d..555e7fe1a 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -224,6 +224,14 @@ in { OnCalendar = "*:0/5"; }; } + { + lass.usershadow = { + enable = true; + }; + } + { + virtualisation.libvirtd.enable = true; + } ]; krebs.build.host = config.krebs.hosts.prism; diff --git a/lass/1systems/shodan.nix b/lass/1systems/shodan.nix index 9d1df1d72..095898380 100644 --- a/lass/1systems/shodan.nix +++ b/lass/1systems/shodan.nix @@ -75,6 +75,10 @@ with import <stockholm/lib>; fsType = "tmpfs"; options = ["nosuid" "nodev" "noatime"]; }; + "/bku" = { + device = "/dev/pool/bku"; + fsType = "ext4"; + }; }; services.udev.extraRules = '' |