From 896919ded57b9c8fbccc88f2e69cf44a8fe3e356 Mon Sep 17 00:00:00 2001 From: e1mo Date: Thu, 28 Mar 2024 19:25:37 +0100 Subject: [PATCH] nixos/parsedmarc: Fix smtp.to and default elasticsearch url Previously evaluaton would fail if `smtp.to` was not set, since the default case was not handled. With the current versions of the python elasticsearch libraries, any configuration containing the modules default would fail since it's not a valid URL. The issue adressed in #279068 is also adressed, thuse closes #279068. --- nixos/modules/services/monitoring/parsedmarc.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/monitoring/parsedmarc.nix b/nixos/modules/services/monitoring/parsedmarc.nix index fa15e3b9e9c9..a14ade59c29e 100644 --- a/nixos/modules/services/monitoring/parsedmarc.nix +++ b/nixos/modules/services/monitoring/parsedmarc.nix @@ -301,7 +301,7 @@ in description = '' The addresses to send outgoing mail to. ''; - apply = x: if x == [] then null else lib.concatStringsSep "," x; + apply = x: if x == [] || x == null then null else lib.concatStringsSep "," x; }; }; @@ -446,7 +446,7 @@ in services.parsedmarc.settings = lib.mkMerge [ (lib.mkIf cfg.provision.elasticsearch { elasticsearch = { - hosts = [ "localhost:9200" ]; + hosts = [ "http://localhost:9200" ]; ssl = false; }; })