Unverified Commit 6ad64af7 authored by IndeedNotJames's avatar IndeedNotJames
Browse files

nixos/consul: use `lib.getExe` where possible 

which allows the use of custom packages, that may not have binaries called `consul` or `consul-alerts` in their `/bin/*` (though arguably pretty unlikely to be ever used)
parent 9c1f2921

nixos/modules/services/networking/consul.nix

+3 −3
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ in 
            (filterAttrs (n: _: hasPrefix "consul.d/" n) config.environment.etc);



        serviceConfig = {

          ExecStart = "@${cfg.package}/bin/consul consul agent -config-dir /etc/consul.d"

          ExecStart = "@${lib.getExe cfg.package} consul agent -config-dir /etc/consul.d"

            + concatMapStrings (n: " -config-file ${n}") configFiles;

          ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";

          PermissionsStartOnly = true;
@@ -207,7 +207,7 @@ in 
          Restart = "on-failure";

          TimeoutStartSec = "infinity";

        } // (optionalAttrs (cfg.leaveOnStop) {

          ExecStop = "${cfg.package}/bin/consul leave";

          ExecStop = "${lib.getExe cfg.package} leave";

        });



        path = with pkgs; [ iproute2 gawk cfg.package ];
@@ -269,7 +269,7 @@ in 


        serviceConfig = {

          ExecStart = ''

            ${cfg.alerts.package}/bin/consul-alerts start \

            ${lib.getExe cfg.alerts.package} start \

              --alert-addr=${cfg.alerts.listenAddr} \

              --consul-addr=${cfg.alerts.consulAddr} \

              ${optionalString cfg.alerts.watchChecks "--watch-checks"} \