buildkite-agent: Only start service once networking is available

buildkite-agent gets the hostname at startup, so needs to be started
after the hostname is set.

1 files changed, 11 insertions, 2 deletions

diff --git a/modules/services/buildkite-agent.nix b/modules/services/buildkite-agent.nix
index 1438eee..165323b 100644
--- a/modules/services/buildkite-agent.nix
+++ b/modules/services/buildkite-agent.nix
@@ -221,11 +221,20 @@ in
           '';
 
         serviceConfig = {
-          KeepAlive = true;
-          RunAtLoad = true;
           ProcessType = "Interactive";
           ThrottleInterval = 30;
 
+          # The combination of KeepAlive.NetworkState and WatchPaths
+          # will ensure that buildkite-agent is started on boot, but
+          # after networking is available (so the hostname is
+          # correct).
+          RunAtLoad = true;
+          KeepAlive.NetworkState = true;
+          WatchPaths = [
+            "/etc/resolv.conf"
+            "/Library/Preferences/SystemConfiguration/NetworkInterfaces.plist"
+          ];
+
           GroupName = "buildkite-agent";
           UserName = "buildkite-agent";
           WorkingDirectory = config.users.users.buildkite-agent.home;