diff --git a/nix/apache-kafka.nix b/nix/apache-kafka.nix index a8baab28..b6c360c9 100644 --- a/nix/apache-kafka.nix +++ b/nix/apache-kafka.nix @@ -175,7 +175,7 @@ with lib; }; in { - command = "${startScript}/bin/start-kafka"; + command = startScript; readiness_probe = { # TODO: need to find a better way to check if kafka is ready. Maybe use one of the scripts in bin? diff --git a/nix/clickhouse/default.nix b/nix/clickhouse/default.nix index cc5f941a..3bd76146 100644 --- a/nix/clickhouse/default.nix +++ b/nix/clickhouse/default.nix @@ -154,7 +154,7 @@ in }; in { - command = "${lib.getExe startScript}"; + command = startScript; readiness_probe = { # FIXME: revert back to clickhouse-client readiness_probe once CI is moved out of github public runners diff --git a/nix/elasticsearch.nix b/nix/elasticsearch.nix index 4e7b4680..ad4f45f8 100644 --- a/nix/elasticsearch.nix +++ b/nix/elasticsearch.nix @@ -178,7 +178,7 @@ in in { - command = "${startScript}"; + command = startScript; readiness_probe = { exec.command = "${pkgs.curl}/bin/curl -f -k http://${config.listenAddress}:${toString config.port}"; diff --git a/nix/mysql/default.nix b/nix/mysql/default.nix index 1201c5ae..72e9aa88 100644 --- a/nix/mysql/default.nix +++ b/nix/mysql/default.nix @@ -278,7 +278,7 @@ in { "${name}" = { - command = "${startScript}/bin/start-mysql"; + command = startScript; readiness_probe = { # Turns out using `--defaults-file` alone doesn't make the readiness_probe work unless `MYSQL_UNIX_PORT` is set. @@ -296,7 +296,7 @@ in availability.restart = "on_failure"; }; "${name}-configure" = { - command = "${configureScript}/bin/configure-mysql"; + command = configureScript; namespace = name; depends_on."${name}".condition = "process_healthy"; }; diff --git a/nix/nginx.nix b/nix/nginx.nix index 3afdb5a4..9899826a 100644 --- a/nix/nginx.nix +++ b/nix/nginx.nix @@ -106,7 +106,7 @@ in in { processes."${name}" = { - command = "${startScript}/bin/start-nginx"; + command = startScript; readiness_probe = { # FIXME need a better health check exec.command = "[ -e ${config.dataDir}/nginx/nginx.pid ]"; diff --git a/nix/prometheus.nix b/nix/prometheus.nix index 4a904ab9..a4881520 100644 --- a/nix/prometheus.nix +++ b/nix/prometheus.nix @@ -84,7 +84,7 @@ in }; in { - command = "${startScript}/bin/start-prometheus"; + command = startScript; readiness_probe = { http_get = { host = config.listenAddress; diff --git a/nix/redis-cluster.nix b/nix/redis-cluster.nix index 7f997e9d..6fbc39a5 100644 --- a/nix/redis-cluster.nix +++ b/nix/redis-cluster.nix @@ -107,7 +107,7 @@ in }; in lib.nameValuePair "${name}-${nodeName}" { - command = "${startScript}/bin/start-redis"; + command = startScript; shutdown.command = "${config.package}/bin/redis-cli -p ${port} shutdown nosave"; readiness_probe = { diff --git a/nix/zookeeper.nix b/nix/zookeeper.nix index e5d65d35..d75344fc 100644 --- a/nix/zookeeper.nix +++ b/nix/zookeeper.nix @@ -138,7 +138,7 @@ with lib; }; in { - command = "${startScript}/bin/start-zookeeper"; + command = startScript; readiness_probe = { exec.command = "echo stat | ${pkgs.netcat.nc}/bin/nc localhost ${toString config.port}";