Skip to content

Commit ba47db2

Browse files
committed
Back out "github-runner: replace mkdir -p -m with umask"
This backs out commit 3b738c7. Setting a `umask` made the parent directory have too conservative of permissions making it so `_github-runner` couldn't access the child directories.
1 parent 9175b4b commit ba47db2

File tree

1 file changed

+10
-16
lines changed

1 file changed

+10
-16
lines changed

modules/services/github-runner/service.nix

+10-16
Original file line numberDiff line numberDiff line change
@@ -57,22 +57,16 @@ in
5757
text = mkBefore (''
5858
echo >&2 "setting up GitHub Runner '${cfg.name}'..."
5959
60-
(
61-
umask -S u=rwx,g=rx,o= > /dev/null
62-
63-
${getExe' pkgs.coreutils "mkdir"} -p ${escapeShellArg (mkStateDir cfg)}
64-
${getExe' pkgs.coreutils "chown"} ${user}:${group} ${escapeShellArg (mkStateDir cfg)}
65-
66-
${getExe' pkgs.coreutils "mkdir"} -p ${escapeShellArg (mkLogDir cfg)}
67-
# launchd will fail to start the service if the outer direction doesn't have sufficient permissions
68-
${getExe' pkgs.coreutils "chmod"} o+rx ${escapeShellArg (mkLogDir { name = ""; })}
69-
${getExe' pkgs.coreutils "chown"} ${user}:${group} ${escapeShellArg (mkLogDir cfg)}
70-
71-
${optionalString (cfg.workDir == null) ''
72-
${getExe' pkgs.coreutils "mkdir"} -p ${escapeShellArg (mkWorkDir cfg)}
73-
${getExe' pkgs.coreutils "chown"} ${user}:${group} ${escapeShellArg (mkWorkDir cfg)}
74-
''}
75-
)
60+
${getExe' pkgs.coreutils "mkdir"} -p -m u=rwx,g=rx,o= ${escapeShellArg (mkStateDir cfg)}
61+
${getExe' pkgs.coreutils "chown"} ${user}:${group} ${escapeShellArg (mkStateDir cfg)}
62+
63+
${getExe' pkgs.coreutils "mkdir"} -p -m u=rwx,g=rx,o= ${escapeShellArg (mkLogDir cfg)}
64+
${getExe' pkgs.coreutils "chown"} ${user}:${group} ${escapeShellArg (mkLogDir cfg)}
65+
66+
${optionalString (cfg.workDir == null) ''
67+
${getExe' pkgs.coreutils "mkdir"} -p -m u=rwx,g=rx,o= ${escapeShellArg (mkWorkDir cfg)}
68+
${getExe' pkgs.coreutils "chown"} ${user}:${group} ${escapeShellArg (mkWorkDir cfg)}
69+
''}
7670
'');
7771
};
7872
}));

0 commit comments

Comments
 (0)