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/networking/consul.nix | |
| parent | d2b58dd39a43282a3657c591f636674912717aab (diff) | |
| download | nixpkgs-437ea9fd370f85451801ae5904a364175ce4eef8.tar nixpkgs-437ea9fd370f85451801ae5904a364175ce4eef8.tar.gz nixpkgs-437ea9fd370f85451801ae5904a364175ce4eef8.tar.bz2 nixpkgs-437ea9fd370f85451801ae5904a364175ce4eef8.tar.lz nixpkgs-437ea9fd370f85451801ae5904a364175ce4eef8.tar.xz nixpkgs-437ea9fd370f85451801ae5904a364175ce4eef8.tar.zst nixpkgs-437ea9fd370f85451801ae5904a364175ce4eef8.zip | |
Fixes #16181 - using bin output for Go services
Diffstat (limited to 'nixos/modules/services/networking/consul.nix')
| -rw-r--r-- | nixos/modules/services/networking/consul.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix index 2aa101f980d..166ee773237 100644 --- a/nixos/modules/services/networking/consul.nix +++ b/nixos/modules/services/networking/consul.nix @@ -178,14 +178,14 @@ in (filterAttrs (n: _: hasPrefix "consul.d/" n) config.environment.etc); serviceConfig = { - ExecStart = "@${cfg.package}/bin/consul consul agent -config-dir /etc/consul.d" + ExecStart = "@${cfg.package.bin}/bin/consul consul agent -config-dir /etc/consul.d" + concatMapStrings (n: " -config-file ${n}") configFiles; - ExecReload = "${cfg.package}/bin/consul reload"; + ExecReload = "${cfg.package.bin}/bin/consul reload"; PermissionsStartOnly = true; User = if cfg.dropPrivileges then "consul" else null; TimeoutStartSec = "0"; } // (optionalAttrs (cfg.leaveOnStop) { - ExecStop = "${cfg.package}/bin/consul leave"; + ExecStop = "${cfg.package.bin}/bin/consul leave"; }); path = with pkgs; [ iproute gnugrep gawk consul ]; @@ -236,7 +236,7 @@ in serviceConfig = { ExecStart = '' - ${cfg.alerts.package}/bin/consul-alerts start \ + ${cfg.alerts.package.bin}/bin/consul-alerts start \ --alert-addr=${cfg.alerts.listenAddr} \ --consul-addr=${cfg.alerts.consulAddr} \ ${optionalString cfg.alerts.watchChecks "--watch-checks"} \ |