summaryrefslogtreecommitdiffstats
path: root/lass/1systems
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-08-29 21:08:02 +0200
committertv <tv@krebsco.de>2017-08-29 21:08:02 +0200
commit247477863628a44c60f591c6df6cc9f5e7818e89 (patch)
tree2492ffb4cda34e13d9653fbebbaba8823875d0a9 /lass/1systems
parentfd69096a27575b9d4d87a10af1492b273dad167c (diff)
parent48c75276c5a5ed8e7ea33ccb330f8ee6b7a6a927 (diff)
Merge remote-tracking branch 'stro/master'
Diffstat (limited to 'lass/1systems')
-rw-r--r--lass/1systems/mors/config.nix12
-rw-r--r--lass/1systems/shodan/config.nix6
2 files changed, 8 insertions, 10 deletions
diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index bb6f84c7b..58f55ce68 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -40,15 +40,6 @@ with import <stockholm/lib>;
};
}
{
- #zalando project
- services.postgresql = {
- enable = true;
- package = pkgs.postgresql;
- };
- virtualisation.docker.enable = true;
- #users.users.mainUser.extraGroups = [ "docker" ];
- }
- {
lass.umts = {
enable = true;
modem = "/dev/serial/by-id/usb-Lenovo_F5521gw_C12AD95CB7B78F90-if09";
@@ -91,6 +82,9 @@ with import <stockholm/lib>;
client.enable = true;
};
}
+ {
+ services.mongodb.enable = true;
+ }
];
krebs.build.host = config.krebs.hosts.mors;
diff --git a/lass/1systems/shodan/config.nix b/lass/1systems/shodan/config.nix
index b6d49d6e4..ef015aebc 100644
--- a/lass/1systems/shodan/config.nix
+++ b/lass/1systems/shodan/config.nix
@@ -41,7 +41,11 @@ with import <stockholm/lib>;
"/boot" = {
device = "/dev/sda1";
};
-
+ "/home" = {
+ device = "/dev/mapper/pool-home";
+ fsType = "btrfs";
+ options = ["defaults" "noatime" "ssd" "compress=lzo"];
+ };
"/tmp" = {
device = "tmpfs";
fsType = "tmpfs";