diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2024-05-02 11:16:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-02 11:16:27 +0200 |
commit | 4a2f53b67a7f5e4dfd435a23b2483a4802c10f00 (patch) | |
tree | 1755015df5e6bac822d91cb22cb8ad6ffdbea8aa /nixos/modules | |
parent | 33489534cf8a8a36e8b2b19b05fe99799de56c35 (diff) | |
parent | 896919ded57b9c8fbccc88f2e69cf44a8fe3e356 (diff) |
Merge pull request #280940 from e1mo/fix-parsedmarc-smtp-to
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/services/monitoring/parsedmarc.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/monitoring/parsedmarc.nix b/nixos/modules/services/monitoring/parsedmarc.nix index 9191a4a697e0b..a14ade59c29eb 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; }; }; @@ -438,7 +438,7 @@ in ]; dashboards.settings.providers = lib.mkIf cfg.provision.grafana.dashboard [{ name = "parsedmarc"; - options.path = "${pkgs.python3Packages.parsedmarc.dashboard}"; + options.path = "${pkgs.parsedmarc.dashboard}"; }]; }; }; @@ -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; }; }) @@ -530,7 +530,7 @@ in MemoryDenyWriteExecute = true; LockPersonality = true; SystemCallArchitectures = "native"; - ExecStart = "${pkgs.python3Packages.parsedmarc}/bin/parsedmarc -c /run/parsedmarc/parsedmarc.ini"; + ExecStart = "${lib.getExe pkgs.parsedmarc} -c /run/parsedmarc/parsedmarc.ini"; }; }; |