buildkite-agents: fix module

serokell · Oct 14, 2019 · a13e14f · a13e14f
1 parent c2ee33c
commit a13e14f
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/nixos/modules/services/continuous-integration/buildkite-agents.nix b/nixos/modules/services/continuous-integration/buildkite-agents.nix
@@ -46,7 +46,7 @@ let
 
       userName = mkOption {
         readOnly = true;
-        default = "buildkite-${name}";
+        default = "buildkite-agent-${name}";
         description = ''
           Username of the systemd service this will run as.
         '';
@@ -245,11 +245,11 @@ in {
           BUILDKITE_SHELL = cfg.shell;
         };
 
-        preStart = let
+
+        serviceConfig = let
           sshDir = "${cfg.statePath}/.ssh";
           tagStr = lib.concatStringsSep "," (lib.mapAttrsToList (k: v: "${k}=${v}") cfg.tags);
-        in
-          ''
+          preStart = ''
             ${optionalString (cfg.sshKeyPath != null) ''
               mkdir -p "${sshDir}"
               chmod 700 "${sshDir}"
@@ -266,10 +266,10 @@ in {
             ${cfg.extraConfig}
             EOF
             ${cfg.extraSetup}
-          '';
-
-        serviceConfig =
+            chown -R $USER $HOME
+          ''; in
           { ExecStart = "${cfg.package}/bin/buildkite-agent start --config ${cfg.statePath}/buildkite-agent.cfg";
+            ExecStartPre = "+${pkgs.writeShellScript "bk-agent-prestart" preStart}";
             User = cfg.userName;
             RestartSec = 5;
             Restart = "on-failure";