Merge pull request #163230 from helsinki-systems/feat/misc-prometheus-varnis

nixos/prometheus/exporters/varnish: improve some defaults
This commit is contained in:
Janne Heß 2022-03-26 18:32:30 +01:00 committed by GitHub
commit a34c788e30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -45,7 +45,8 @@ in
}; };
instance = mkOption { instance = mkOption {
type = types.nullOr types.str; type = types.nullOr types.str;
default = null; default = config.services.varnish.stateDir;
defaultText = lib.literalExpression "config.services.varnish.stateDir";
description = '' description = ''
varnishstat -n value. varnishstat -n value.
''; '';
@ -66,7 +67,7 @@ in
}; };
}; };
serviceOpts = { serviceOpts = {
path = [ pkgs.varnish ]; path = [ config.services.varnish.package ];
serviceConfig = { serviceConfig = {
RestartSec = mkDefault 1; RestartSec = mkDefault 1;
DynamicUser = false; DynamicUser = false;