summaryrefslogtreecommitdiffstats
path: root/nixos
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2021-03-13 15:21:19 +0100
committerMaximilian Bosch <maximilian@mbosch.me>2021-03-13 15:21:55 +0100
commit22b61e52634160847a19e63b65265219f9a806d6 (patch)
tree5d3635f108c902be42e17f4a4e26a3141374f741 /nixos
parentd1dba66e156d3dc11cbe0d89752962a06cad56e1 (diff)
nixos/prometheus/exporters: fix eval if only `openFirewall = true;` is set
If `openFirewall = true`, but no `firewallFilter` is set, the evaluation fails with the following error: The option `services.prometheus.exporters.node.firewallFilter` is defined both null and not null, in `/home/ma27/Projects/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix' and `/home/ma27/Projects/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix'. Originally introduced by me in #115185. The problem is that `mkOptionDefault` has - as its name suggests - the same priority as the default-value of the option `firewallFilter` and thus it conflicts if this declaration and the actual default value are set which is the case if `firewallFilter` isn't specified somewhere else.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/monitoring/prometheus/exporters.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index 74ad4bf1837f..5811cda11256 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -131,7 +131,7 @@ let
inherit name port;
} // extraOpts);
} ({ config, ... }: mkIf config.openFirewall {
- firewallFilter = mkOptionDefault "-p tcp -m tcp --dport ${toString config.port}";
+ firewallFilter = mkDefault "-p tcp -m tcp --dport ${toString config.port}";
})];
internal = true;
default = {};