Merge pull request #118516 from happysalada/fix_vector

This commit is contained in:
Sandro 2021-04-05 02:32:23 +02:00 committed by GitHub
commit 95a5678118
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -3,7 +3,8 @@
with lib; with lib;
let cfg = config.services.vector; let cfg = config.services.vector;
in { in
{
options.services.vector = { options.services.vector = {
enable = mkEnableOption "Vector"; enable = mkEnableOption "Vector";
@ -37,15 +38,17 @@ in {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network-online.target" ]; after = [ "network-online.target" ];
requires = [ "network-online.target" ]; requires = [ "network-online.target" ];
serviceConfig = let serviceConfig =
let
format = pkgs.formats.toml { }; format = pkgs.formats.toml { };
conf = format.generate "vector.toml" cfg.settings; conf = format.generate "vector.toml" cfg.settings;
validateConfig = file: validateConfig = file:
pkgs.runCommand "validate-vector-conf" { } '' pkgs.runCommand "validate-vector-conf" { } ''
${pkgs.vector}/bin/vector validate --no-topology --no-environment "${file}" ${pkgs.vector}/bin/vector validate --no-environment "${file}"
ln -s "${file}" "$out" ln -s "${file}" "$out"
''; '';
in { in
{
ExecStart = "${pkgs.vector}/bin/vector --config ${validateConfig conf}"; ExecStart = "${pkgs.vector}/bin/vector --config ${validateConfig conf}";
User = "vector"; User = "vector";
Group = "vector"; Group = "vector";