Remove some httpd settings. Enable sysstat on wendy.
Eelco Dolstra committed
Jun 10, 2013 at 08:35 UTC
9787a846df8cb6b440d73ff787b127786156f279
3 files changed
+23
-4
delft/delft-webserver.nix
-3
@@ -62,7 +62,6 @@ in
62
63
httpd = {
64
enable = true;
65
- multiProcessingModule = "worker";
65
logPerVirtualHost = true;
66
adminAddr = "e.dolstra@tudelft.nl";
67
hostName = "localhost";
@@ -80,8 +79,6 @@ in
79
</Location>
80
81
ExtendedStatus On
83
-
84
- StartServers 15
82
'';
83
84
phpOptions =
delft/sysstat.nix
new
+22
@@ -0,0 +1,22 @@
1
+{ pkgs, ...}:
2
+{
3
+ environment.systemPackages = [ pkgs.sysstat ];
4
+
5
+ services.cron.systemCronJobs =
6
+ [ "*/10 * * * * root ${pkgs.sysstat}/lib/sa/sa1 -S DISK 1 1"
7
+ "53 23 * * * root ${pkgs.sysstat}/lib/sa/sa2 -A"
8
+ ];
9
+
10
+ systemd.services."sysstat-init" =
11
+ { description = "Create sysstat directory";
12
+ wantedBy = [ "multi-user.target" ];
13
+ script =
14
+ ''
15
+ mkdir -p /var/log/sa
16
+ '';
17
+ serviceConfig =
18
+ { Type = "oneshot";
19
+ RemainAfterExit = true;
20
+ };
21
+ };
22
+}
delft/wendy.nix
+1
-1
@@ -6,7 +6,7 @@ let
6
7
in
8
{
9
- require = [ ./build-machines-dell-r815.nix ./delft-webserver.nix ];
9
+ require = [ ./build-machines-dell-r815.nix ./delft-webserver.nix ./sysstat.nix];
10
11
fileSystems."/backup" =
12
{ device = "130.161.158.5:/dxs/users4/group/buildfarm";