Merge remote-tracking branch 'cd/master'

2 files changed, 8 insertions, 4 deletions

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index dcc3edd82..a9ba1eadd 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 70e25e2e5..d0d07d5ca 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;