public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

munin: fix tests by replacing cron with systemd timer

This commit is contained in:
Jörg Thalheim 2017-03-22 00:08:41 +01:00
parent 2e06a585bc
commit b4169bb8dd
No known key found for this signature in database
GPG Key ID: CA4106B8D7CC79FA
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nixos/modules/services/monitoring/munin.nix
View File

@ -193,14 +193,26 @@ in
}) (mkIf cronCfg.enable { }) (mkIf cronCfg.enable {
services.cron.systemCronJobs = [ systemd.timers.munin-cron = {
"*/5 * * * * munin ${pkgs.munin}/bin/munin-cron --config ${muninConf}" description = "batch Munin master programs";
]; wantedBy = [ "timers.target" ];
timerConfig.OnCalendar = "*:0/5";
};
systemd.services.munin-cron = {
description = "batch Munin master programs";
unitConfig.Documentation = "man:munin-cron(8)";
serviceConfig = {
Type = "oneshot";
User = "munin";
ExecStart = "${pkgs.munin}/bin/munin-cron --config ${muninConf}";
};
};
system.activationScripts.munin-cron = stringAfter [ "users" "groups" ] '' system.activationScripts.munin-cron = stringAfter [ "users" "groups" ] ''
mkdir -p /var/{run,log,www,lib}/munin mkdir -p /var/{run,log,www,lib}/munin
chown -R munin:munin /var/{run,log,www,lib}/munin chown -R munin:munin /var/{run,log,www,lib}/munin
''; '';
})]; })];
} }

1
nixos/tests/munin.nix
View File

@ -29,6 +29,7 @@ import ./make-test.nix ({ pkgs, ...} : {
startAll; startAll;
$one->waitForUnit("munin-node.service"); $one->waitForUnit("munin-node.service");
$one->succeed('systemctl start munin-cron');
$one->waitForFile("/var/lib/munin/one/one-uptime-uptime-g.rrd"); $one->waitForFile("/var/lib/munin/one/one-uptime-uptime-g.rrd");
$one->waitForFile("/var/www/munin/one/index.html"); $one->waitForFile("/var/www/munin/one/index.html");
''; '';