From fbb7e0c82f297815950e9153c21e561a704bfcd5 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Mon, 8 Oct 2018 16:30:53 +0200
Subject: [PATCH] nixos/prometheus-exporters: fix unapplied service config
Prior to this commit, the default values for `Restart`, `PrivateTmp` and
`WorkingDirectory` were falsely ignored.
I also added myself as maintainer.
---
.../monitoring/prometheus/exporters.nix | 21 ++++++++++---------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index 1d5f400250fd..ae8caac436da 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -123,15 +123,13 @@ let
systemd.services."prometheus-${name}-exporter" = mkMerge ([{
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
- serviceConfig = {
- Restart = mkDefault "always";
- PrivateTmp = mkDefault true;
- WorkingDirectory = mkDefault /tmp;
- } // mkIf (!(serviceOpts.serviceConfig.DynamicUser or false)) {
- User = conf.user;
- Group = conf.group;
- };
- } serviceOpts ]);
+ serviceConfig.Restart = mkDefault "always";
+ serviceConfig.PrivateTmp = mkDefault true;
+ serviceConfig.WorkingDirectory = mkDefault /tmp;
+ } serviceOpts ] ++ optional (serviceOpts.serviceConfig.DynamicUser or false) {
+ serviceConfig.User = conf.user;
+ serviceConfig.Group = conf.group;
+ });
};
in
{
@@ -172,5 +170,8 @@ in
}) exporterOpts)
);
- meta.doc = ./exporters.xml;
+ meta = {
+ doc = ./exporters.xml;
+ maintainers = [ maintainers.willibutz ];
+ };
}