summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-07-03 21:30:46 +0200
committertv <tv@krebsco.de>2016-07-03 21:30:46 +0200
commit99136e1764d5eb0d2e04252af7097062e6aaaa0b (patch)
treea50a7479e50a6954495e3af4d1860dc4388bc2e8
parent7c68b926aeb6ae38b21e5b7a23bb46ddf402bea9 (diff)
tv: define journald default extraConfig
-rw-r--r--tv/1systems/cd.nix5
-rw-r--r--tv/1systems/mu.nix5
-rw-r--r--tv/1systems/wu.nix5
-rw-r--r--tv/1systems/xu.nix5
-rw-r--r--tv/2configs/default.nix7
5 files changed, 7 insertions, 20 deletions
diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix
index 75c19008..2120134c 100644
--- a/tv/1systems/cd.nix
+++ b/tv/1systems/cd.nix
@@ -112,9 +112,4 @@ with config.krebs.lib;
rxvt_unicode.terminfo
tcpdump
];
-
- services.journald.extraConfig = ''
- SystemMaxUse=1G
- RuntimeMaxUse=128M
- '';
}
diff --git a/tv/1systems/mu.nix b/tv/1systems/mu.nix
index ec208a0b..e7908e29 100644
--- a/tv/1systems/mu.nix
+++ b/tv/1systems/mu.nix
@@ -157,11 +157,6 @@ with config.krebs.lib;
];
};
- services.journald.extraConfig = ''
- SystemMaxUse=1G
- RuntimeMaxUse=128M
- '';
-
# see tmpfiles.d(5)
systemd.tmpfiles.rules = [
"d /tmp 1777 root root - -" # does this work with mounted /tmp?
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index d115e274..645cda61 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -164,11 +164,6 @@ with config.krebs.lib;
services.printing.enable = true;
- services.journald.extraConfig = ''
- SystemMaxUse=1G
- RuntimeMaxUse=128M
- '';
-
# see tmpfiles.d(5)
systemd.tmpfiles.rules = [
"d /tmp 1777 root root - -" # does this work with mounted /tmp?
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index 7277f5cb..1cd1df1a 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -176,11 +176,6 @@ with config.krebs.lib;
services.printing.enable = true;
- services.journald.extraConfig = ''
- SystemMaxUse=1G
- RuntimeMaxUse=128M
- '';
-
# see tmpfiles.d(5)
systemd.tmpfiles.rules = [
"d /tmp 1777 root root - -" # does this work with mounted /tmp?
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index dcc3edd8..0f625813 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -169,6 +169,13 @@ with config.krebs.lib;
}
{
+ services.journald.extraConfig = ''
+ SystemMaxUse=1G
+ RuntimeMaxUse=128M
+ '';
+ }
+
+ {
services.openssh = {
enable = true;
hostKeys = [