diff options
| author | Kamil Chmielewski <kamil.chm@gmail.com> | 2016-06-13 23:32:16 +0200 |
|---|---|---|
| committer | Kamil Chmielewski <kamil.chm@gmail.com> | 2016-06-13 23:32:16 +0200 |
| commit | 437ea9fd370f85451801ae5904a364175ce4eef8 (patch) | |
| tree | 8e25787064f24fc8c8d11fac3dcd55a2e776cf39 /nixos/modules/services/monitoring | |
| parent | d2b58dd39a43282a3657c591f636674912717aab (diff) | |
| download | nixlib-437ea9fd370f85451801ae5904a364175ce4eef8.tar nixlib-437ea9fd370f85451801ae5904a364175ce4eef8.tar.gz nixlib-437ea9fd370f85451801ae5904a364175ce4eef8.tar.bz2 nixlib-437ea9fd370f85451801ae5904a364175ce4eef8.tar.lz nixlib-437ea9fd370f85451801ae5904a364175ce4eef8.tar.xz nixlib-437ea9fd370f85451801ae5904a364175ce4eef8.tar.zst nixlib-437ea9fd370f85451801ae5904a364175ce4eef8.zip | |
Fixes #16181 - using bin output for Go services
Diffstat (limited to 'nixos/modules/services/monitoring')
| -rw-r--r-- | nixos/modules/services/monitoring/bosun.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/monitoring/grafana.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/monitoring/scollector.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix index 51d38e8db4de..9a1e790d3ab6 100644 --- a/nixos/modules/services/monitoring/bosun.nix +++ b/nixos/modules/services/monitoring/bosun.nix @@ -148,7 +148,7 @@ in { User = cfg.user; Group = cfg.group; ExecStart = '' - ${cfg.package}/bin/bosun -c ${configFile} + ${cfg.package.bin}/bin/bosun -c ${configFile} ''; }; }; diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index defbd9289dcd..0b7f3ce0a29b 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -228,7 +228,7 @@ in { after = ["networking.target"]; environment = mapAttrs' (n: v: nameValuePair "GF_${n}" (toString v)) envOptions; serviceConfig = { - ExecStart = "${cfg.package}/bin/grafana-server -homepath ${cfg.dataDir}"; + ExecStart = "${cfg.package.bin}/bin/grafana-server -homepath ${cfg.dataDir}"; WorkingDirectory = cfg.dataDir; User = "grafana"; }; diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix index 1e397435e600..2684482c6184 100644 --- a/nixos/modules/services/monitoring/scollector.nix +++ b/nixos/modules/services/monitoring/scollector.nix @@ -119,7 +119,7 @@ in { PermissionsStartOnly = true; User = cfg.user; Group = cfg.group; - ExecStart = "${cfg.package}/bin/scollector -conf=${conf} ${lib.concatStringsSep " " cfg.extraOpts}"; + ExecStart = "${cfg.package.bin}/bin/scollector -conf=${conf} ${lib.concatStringsSep " " cfg.extraOpts}"; }; }; |