diff options
author | lassulus <lass@aidsballs.de> | 2016-07-07 23:33:18 +0200 |
---|---|---|
committer | lassulus <lass@aidsballs.de> | 2016-07-07 23:33:18 +0200 |
commit | f4b2262c7eb07a4b66a9352e9851e9e94c13b540 (patch) | |
tree | 3c42557a71d240ec242af36cabb3a618aad0665d /tv/2configs | |
parent | 0ff8c0416ed838a1155ecc015d81708bb72ea1d3 (diff) | |
parent | f7d966043d04d73df719cbe6c13e4c1aa16bb7f7 (diff) |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/2configs')
-rw-r--r-- | tv/2configs/default.nix | 8 | ||||
-rw-r--r-- | tv/2configs/nginx/default.nix | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index dcc3edd8..a9ba1ead 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -153,6 +153,7 @@ with config.krebs.lib; services.cron.enable = false; services.nscd.enable = false; services.ntp.enable = false; + services.timesyncd.enable = true; } { @@ -169,6 +170,13 @@ with config.krebs.lib; } { + services.journald.extraConfig = '' + SystemMaxUse=1G + RuntimeMaxUse=128M + ''; + } + + { services.openssh = { enable = true; hostKeys = [ diff --git a/tv/2configs/nginx/default.nix b/tv/2configs/nginx/default.nix index 70e25e2e..d0d07d5c 100644 --- a/tv/2configs/nginx/default.nix +++ b/tv/2configs/nginx/default.nix @@ -4,10 +4,6 @@ with config.krebs.lib; { krebs.nginx = { - extraConfig = '' - events { - } - ''; servers.default.locations = [ (nameValuePair "= /etc/os-release" '' default_type text/plain; |