From b49fb90be3959d77f8fe1d7ccc84751b04ff48cf Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Fri, 10 Jul 2015 20:35:16 +0200
Subject: [PATCH] tv sanitize: {rtkit,cront,nscd,ntp}.enable
---
modules/cd/default.nix | 6 ------
modules/mkdir/default.nix | 6 ------
modules/mu/default.nix | 9 ---------
modules/rmdir/default.nix | 6 ------
modules/tv/sanitize.nix | 5 +++++
modules/wu/default.nix | 5 -----
6 files changed, 5 insertions(+), 32 deletions(-)
diff --git a/modules/cd/default.nix b/modules/cd/default.nix
index 45b798e27..b36355671 100644
--- a/modules/cd/default.nix
+++ b/modules/cd/default.nix
@@ -61,10 +61,6 @@ in
tcpdump
];
- security.rtkit.enable = false;
-
- services.cron.enable = false;
-
services.ejabberd-cd = {
enable = true;
};
@@ -74,8 +70,6 @@ in
RuntimeMaxUse=128M
'';
- services.ntp.enable = false;
-
services.openssh = {
enable = true;
hostKeys = [
diff --git a/modules/mkdir/default.nix b/modules/mkdir/default.nix
index e76419298..f2b32f7ec 100644
--- a/modules/mkdir/default.nix
+++ b/modules/mkdir/default.nix
@@ -60,17 +60,11 @@ in
tcpdump
];
- security.rtkit.enable = false;
-
- services.cron.enable = false;
-
services.journald.extraConfig = ''
SystemMaxUse=1G
RuntimeMaxUse=128M
'';
- services.ntp.enable = false;
-
services.openssh = {
enable = true;
hostKeys = [
diff --git a/modules/mu/default.nix b/modules/mu/default.nix
index 8490c842d..1f4888718 100644
--- a/modules/mu/default.nix
+++ b/modules/mu/default.nix
@@ -238,17 +238,8 @@ in
];
};
- security.rtkit.enable = false;
- services.nscd.enable = false;
- services.ntp.enable = false;
#services.dbus.enable = true; # rqd4 wpa_supplicant
- services.sshd.enable = true;
-
- # vixiecron sucks
- services.cron.enable = false;
- services.fcron.enable = true;
-
fonts.fonts = [
pkgs.xlibs.fontschumachermisc
];
diff --git a/modules/rmdir/default.nix b/modules/rmdir/default.nix
index d24ad5736..26360b8cd 100644
--- a/modules/rmdir/default.nix
+++ b/modules/rmdir/default.nix
@@ -61,17 +61,11 @@ in
tcpdump
];
- security.rtkit.enable = false;
-
- services.cron.enable = false;
-
services.journald.extraConfig = ''
SystemMaxUse=1G
RuntimeMaxUse=128M
'';
- services.ntp.enable = false;
-
services.openssh = {
enable = true;
hostKeys = [
diff --git a/modules/tv/sanitize.nix b/modules/tv/sanitize.nix
index adc8141da..b2f60d3f6 100644
--- a/modules/tv/sanitize.nix
+++ b/modules/tv/sanitize.nix
@@ -5,4 +5,9 @@
{
nano = pkgs.runCommand "empty" {} "mkdir -p $out";
};
+
+ security.rtkit.enable = false;
+ services.cron.enable = false;
+ services.nscd.enable = false;
+ services.ntp.enable = false;
}
diff --git a/modules/wu/default.nix b/modules/wu/default.nix
index 727bca218..8dd46e076 100644
--- a/modules/wu/default.nix
+++ b/modules/wu/default.nix
@@ -324,11 +324,6 @@ in
# '';
#};
- security.rtkit.enable = false;
-
- services.cron.enable = false;
- services.nscd.enable = false;
- services.ntp.enable = false;
#services.dbus.enable = true; # rqd4 wpa_supplicant
services.logind.extraConfig = ''