From 6b6f2af918c8bfa96f148ac84375cc7d9a0a3883 Mon Sep 17 00:00:00 2001
From: Jean-Marie 'Histausse' Mineau <histausse@protonmail.com>
Date: Sun, 23 Feb 2025 14:45:20 +0100
Subject: [PATCH] fix

---
 pp-node-exporter.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pp-node-exporter.nix b/pp-node-exporter.nix
index bacb1ac..3bf31a5 100644
--- a/pp-node-exporter.nix
+++ b/pp-node-exporter.nix
@@ -6,19 +6,16 @@ let
     text = cfg.prometheusCa;
   };
   yaml = pkgs.formats.yaml { };
-  nodeWebConfig = yaml.generate "prometheus-node-exporter-webconfig.yml" (lib.mkMerge [
-    ({
+  nodeWebConfig = yaml.generate "prometheus-node-exporter-webconfig.yml" {
       tls_server_config = {
         client_ca_file = prometheusCaFile;
         cert_file = cfg.prometheusNodeExporterCertFile;
         key_file = cfg.prometheusNodeExporterCertKeyFile;
         client_auth_type = "RequireAndVerifyClientCert";
-      };
-    })
-    (lib.mkIf (cfg.prometheusNodeExporterAllowScrapperSans != null) {
-      tls_server_config.client_allowed_sans = cfg.prometheusNodeExporterAllowScrapperSans;
-    })
-  ]);
+      } // (if (cfg.prometheusNodeExporterAllowScrapperSans != null) then {
+        client_allowed_sans = cfg.prometheusNodeExporterAllowScrapperSans;
+      } else {});
+  };
 in {
   options.services.ppNodeExporter = {
     prometheusCa = lib.mkOption {