movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-12 05:16:25 +03:00
Code Activity

nixos/prometheus: use ExecStart instead of a shell script

Browse source 
This uses fewer lines of code and one less process.
This commit is contained in:
Bas van Dijk 2019-04-08 13:44:22 +02:00 • committed by Jean-Baptiste Giraudeau
parent 0333d877c2
commit a59c92903e
No known key found for this signature in database
GPG key ID: E96EF57FD501B961
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
nixos/modules/services/monitoring/prometheus/default.nix
View file

@ -662,12 +662,10 @@ in {
systemd.services.prometheus = { systemd.services.prometheus = {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network.target" ]; after = [ "network.target" ];
script = ''
#!/bin/sh
exec ${cfg.package}/bin/prometheus \
${concatStringsSep " \\\n " cmdlineArgs}
'';
serviceConfig = { serviceConfig = {
ExecStart = "${cfg.package}/bin/prometheus" +
optionalString (length cmdlineArgs != 0) (" \\\n " +
concatStringsSep " \\\n " cmdlineArgs);
User = promUser; User = promUser;
Restart = "always"; Restart = "always";
WorkingDirectory = /var/lib/prometheus; WorkingDirectory = /var/lib/prometheus;
@ -679,12 +677,10 @@ in {
systemd.services.prometheus2 = { systemd.services.prometheus2 = {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network.target" ]; after = [ "network.target" ];
script = ''
#!/bin/sh
exec ${cfg2.package}/bin/prometheus \
${concatStringsSep " \\\n " cmdlineArgs2}
'';
serviceConfig = { serviceConfig = {
ExecStart = "${cfg2.package}/bin/prometheus" +
optionalString (length cmdlineArgs2 != 0) (" \\\n " +
concatStringsSep " \\\n " cmdlineArgs2);
User = promUser; User = promUser;
Restart = "always"; Restart = "always";
WorkingDirectory = /var/lib/prometheus2; WorkingDirectory = /var/lib/prometheus2;