diff options
| author | Martin Milata <martin@martinmilata.cz> | 2020-03-06 01:24:48 +0100 |
|---|---|---|
| committer | Martin Milata <martin@martinmilata.cz> | 2020-03-06 01:44:05 +0100 |
| commit | e7ed7901a8c7242e4c12806547e5405e79b17aeb (patch) | |
| tree | a95e2c5b0cfb1a3704a7e7fa53ff46a28aba0d8d | |
| parent | 3b5cf35e8bc5198cbd9f2e34a6df9c971947a7e8 (diff) | |
| download | nixpkgs-e7ed7901a8c7242e4c12806547e5405e79b17aeb.tar nixpkgs-e7ed7901a8c7242e4c12806547e5405e79b17aeb.tar.gz nixpkgs-e7ed7901a8c7242e4c12806547e5405e79b17aeb.tar.bz2 nixpkgs-e7ed7901a8c7242e4c12806547e5405e79b17aeb.tar.lz nixpkgs-e7ed7901a8c7242e4c12806547e5405e79b17aeb.tar.xz nixpkgs-e7ed7901a8c7242e4c12806547e5405e79b17aeb.tar.zst nixpkgs-e7ed7901a8c7242e4c12806547e5405e79b17aeb.zip | |
nixos/prometheus-mail-exporter: misc fixes
- Fix misspelled option. mkRenamedOptionModule is not used because the option hasn't really worked before. - Add missing cfg.telemetryPath arg to ExecStart. - Fix mkdir invocation in test.
| -rw-r--r-- | nixos/modules/services/monitoring/prometheus/exporters/mail.nix | 3 | ||||
| -rw-r--r-- | nixos/tests/prometheus-exporters.nix | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/mail.nix b/nixos/modules/services/monitoring/prometheus/exporters/mail.nix index 4d9239f7bb3..18c5c4dd162 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/mail.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/mail.nix @@ -90,7 +90,7 @@ let Timeout until mails are considered "didn't make it". ''; }; - disableFileDelition = mkOption { + disableFileDeletion = mkOption { type = types.bool; default = false; description = '' @@ -147,6 +147,7 @@ in ExecStart = '' ${pkgs.prometheus-mail-exporter}/bin/mailexporter \ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --web.telemetry-path ${cfg.telemetryPath} \ --config.file ${ if cfg.configuration != null then configurationFile else (escapeShellArg cfg.configFile) } \ diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 3d0d00bfbe6..b84e589e84c 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -224,7 +224,7 @@ let after = [ "postfix.service" ]; requires = [ "postfix.service" ]; preStart = '' - mkdir -p 0600 mail-exporter/new + mkdir -p -m 0700 mail-exporter/new ''; serviceConfig = { ProtectHome = true; |