diff options
| author | Janne Heß <janne@hess.ooo> | 2022-03-26 18:32:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-26 18:32:30 +0100 |
| commit | a34c788e30fffdbc808e4706bcf50b625af2686a (patch) | |
| tree | 3cf78df7c0f71f7e19817fff03e51625251cd5b1 /nixos/modules | |
| parent | fae56a205ee356a0a4b22dab36ef99a3a2afbc10 (diff) | |
| parent | a28591680be7ff4daa6cc97d33239a5357a8630a (diff) | |
| download | nixlib-a34c788e30fffdbc808e4706bcf50b625af2686a.tar nixlib-a34c788e30fffdbc808e4706bcf50b625af2686a.tar.gz nixlib-a34c788e30fffdbc808e4706bcf50b625af2686a.tar.bz2 nixlib-a34c788e30fffdbc808e4706bcf50b625af2686a.tar.lz nixlib-a34c788e30fffdbc808e4706bcf50b625af2686a.tar.xz nixlib-a34c788e30fffdbc808e4706bcf50b625af2686a.tar.zst nixlib-a34c788e30fffdbc808e4706bcf50b625af2686a.zip | |
Merge pull request #163230 from helsinki-systems/feat/misc-prometheus-varnis
nixos/prometheus/exporters/varnish: improve some defaults
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/monitoring/prometheus/exporters/varnish.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix index 5b5a6e18fcd6..ede6028933a4 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix @@ -45,7 +45,8 @@ in }; instance = mkOption { type = types.nullOr types.str; - default = null; + default = config.services.varnish.stateDir; + defaultText = lib.literalExpression "config.services.varnish.stateDir"; description = '' varnishstat -n value. ''; @@ -66,7 +67,7 @@ in }; }; serviceOpts = { - path = [ pkgs.varnish ]; + path = [ config.services.varnish.package ]; serviceConfig = { RestartSec = mkDefault 1; DynamicUser = false; |