diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2017-03-22 00:08:41 +0100 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2017-03-22 00:16:36 +0100 |
commit | b4169bb8dde4a4afa829132703455e4def13a633 (patch) | |
tree | 72e20f79a4f1f44c6de17038ac013df610c6c290 | |
parent | 2e06a585bce2860c4a8bf6ae832b0dbdb4fbc3b7 (diff) | |
download | nixpkgs-b4169bb8dde4a4afa829132703455e4def13a633.tar nixpkgs-b4169bb8dde4a4afa829132703455e4def13a633.tar.gz nixpkgs-b4169bb8dde4a4afa829132703455e4def13a633.tar.bz2 nixpkgs-b4169bb8dde4a4afa829132703455e4def13a633.tar.lz nixpkgs-b4169bb8dde4a4afa829132703455e4def13a633.tar.xz nixpkgs-b4169bb8dde4a4afa829132703455e4def13a633.tar.zst nixpkgs-b4169bb8dde4a4afa829132703455e4def13a633.zip |
munin: fix tests by replacing cron with systemd timer
-rw-r--r-- | nixos/modules/services/monitoring/munin.nix | 20 | ||||
-rw-r--r-- | nixos/tests/munin.nix | 1 |
2 files changed, 17 insertions, 4 deletions
diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index 364f18e7543..b8c26a5c89b 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -193,14 +193,26 @@ in }) (mkIf cronCfg.enable { - services.cron.systemCronJobs = [ - "*/5 * * * * munin ${pkgs.munin}/bin/munin-cron --config ${muninConf}" - ]; + systemd.timers.munin-cron = { + 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" ] '' mkdir -p /var/{run,log,www,lib}/munin chown -R munin:munin /var/{run,log,www,lib}/munin ''; - })]; } diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix index 50746d17b45..40fafc62514 100644 --- a/nixos/tests/munin.nix +++ b/nixos/tests/munin.nix @@ -29,6 +29,7 @@ import ./make-test.nix ({ pkgs, ...} : { startAll; $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/www/munin/one/index.html"); ''; |