public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/prometheus-exporters: fix unapplied service config

Browse Source 
Prior to this commit, the default values for `Restart`, `PrivateTmp` and
`WorkingDirectory` were falsely ignored.

I also added myself as maintainer.
This commit is contained in:
WilliButz 2018-10-08 16:30:53 +02:00
parent 24320f4a9e
commit fbb7e0c82f
No known key found for this signature in database
GPG Key ID: 92582A10F1179CB2
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
nixos/modules/services/monitoring/prometheus/exporters.nix
View File

@ -123,15 +123,13 @@ let
systemd.services."prometheus-${name}-exporter" = mkMerge ([{ systemd.services."prometheus-${name}-exporter" = mkMerge ([{
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network.target" ]; after = [ "network.target" ];
serviceConfig = { serviceConfig.Restart = mkDefault "always";
Restart = mkDefault "always"; serviceConfig.PrivateTmp = mkDefault true;
PrivateTmp = mkDefault true; serviceConfig.WorkingDirectory = mkDefault /tmp;
WorkingDirectory = mkDefault /tmp; } serviceOpts ] ++ optional (serviceOpts.serviceConfig.DynamicUser or false) {
} // mkIf (!(serviceOpts.serviceConfig.DynamicUser or false)) { serviceConfig.User = conf.user;
User = conf.user; serviceConfig.Group = conf.group;
Group = conf.group; });
};
} serviceOpts ]);
}; };
in in
{ {
@ -172,5 +170,8 @@ in
}) exporterOpts) }) exporterOpts)
); );
meta.doc = ./exporters.xml; meta = {
doc = ./exporters.xml;
maintainers = [ maintainers.willibutz ];
};
} }