From 35c015ff9165125cb2090b721b41228085fd2cb8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 17 Jan 2024 14:56:49 +0100
Subject: [PATCH] nixos/ntpd-rs: fix metrics service

---
 nixos/modules/services/networking/ntp/ntpd-rs.nix |  4 ++--
 nixos/tests/ntpd-rs.nix                           | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/networking/ntp/ntpd-rs.nix b/nixos/modules/services/networking/ntp/ntpd-rs.nix
index a10b570f30bc..4643ac146ddb 100644
--- a/nixos/modules/services/networking/ntp/ntpd-rs.nix
+++ b/nixos/modules/services/networking/ntp/ntpd-rs.nix
@@ -74,13 +74,13 @@ in
       };
     };
 
-    systemd.services.ntp-rs-metrics = lib.mkIf cfg.metrics.enable {
+    systemd.services.ntpd-rs-metrics = lib.mkIf cfg.metrics.enable {
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         User = "";
         Group = "";
         DynamicUser = true;
-        ExecStart = [ "" "${lib.makeBinPath [ cfg.package ]}/bin/ntp-metrics-exporter --config=${configFile}" ];
+        ExecStart = [ "" "${lib.makeBinPath [ cfg.package ]}/ntp-metrics-exporter --config=${configFile}" ];
       };
     };
   };
diff --git a/nixos/tests/ntpd-rs.nix b/nixos/tests/ntpd-rs.nix
index 2901be523520..6f3c80e87f07 100644
--- a/nixos/tests/ntpd-rs.nix
+++ b/nixos/tests/ntpd-rs.nix
@@ -41,9 +41,11 @@ import ./make-test-python.nix ({ lib, ... }:
 
   testScript = { nodes, ... }: ''
     start_all()
-    server.wait_for_unit('multi-user.target')
-    client.wait_for_unit('multi-user.target')
-    server.succeed('systemctl is-active ntpd-rs.service')
-    client.succeed('systemctl is-active ntpd-rs.service')
+
+    for machine in (server, client):
+      machine.wait_for_unit('multi-user.target')
+      machine.succeed('systemctl is-active ntpd-rs.service')
+      machine.succeed('systemctl is-active ntpd-rs-metrics.service')
+      machine.succeed('curl http://localhost:9975/metrics | grep ntp_uptime_seconds')
   '';
 })