From a59c92903efb83db34aa7016418cedcded1d808c Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Mon, 8 Apr 2019 13:44:22 +0200 Subject: [PATCH] nixos/prometheus: use ExecStart instead of a shell script This uses fewer lines of code and one less process. --- .../services/monitoring/prometheus/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index c398367594a..6ff662b53cb 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -662,12 +662,10 @@ in { systemd.services.prometheus = { wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - script = '' - #!/bin/sh - exec ${cfg.package}/bin/prometheus \ - ${concatStringsSep " \\\n " cmdlineArgs} - ''; serviceConfig = { + ExecStart = "${cfg.package}/bin/prometheus" + + optionalString (length cmdlineArgs != 0) (" \\\n " + + concatStringsSep " \\\n " cmdlineArgs); User = promUser; Restart = "always"; WorkingDirectory = /var/lib/prometheus; @@ -679,12 +677,10 @@ in { systemd.services.prometheus2 = { wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - script = '' - #!/bin/sh - exec ${cfg2.package}/bin/prometheus \ - ${concatStringsSep " \\\n " cmdlineArgs2} - ''; serviceConfig = { + ExecStart = "${cfg2.package}/bin/prometheus" + + optionalString (length cmdlineArgs2 != 0) (" \\\n " + + concatStringsSep " \\\n " cmdlineArgs2); User = promUser; Restart = "always"; WorkingDirectory = /var/lib/prometheus2;