simplify
This commit is contained in:
@@ -32,10 +32,6 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.pathsToLink = [
|
|
||||||
"/bin"
|
|
||||||
];
|
|
||||||
|
|
||||||
users.users.gitea-runner = {
|
users.users.gitea-runner = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
description = "Gitea Actions Runner";
|
description = "Gitea Actions Runner";
|
||||||
@@ -51,23 +47,12 @@ users.users.gitea-runner = {
|
|||||||
|
|
||||||
users.groups.gitea-runner = { };
|
users.groups.gitea-runner = { };
|
||||||
|
|
||||||
systemd.tmpfiles.rules = [
|
|
||||||
"d /data/runner 0755 gitea-runner gitea-runner -"
|
|
||||||
"f /data/runner/gitea-infrastructure-token.txt 0600 gitea-runner gitea-runner -"
|
|
||||||
"d /var/lib/gitea-runner 0755 gitea-runner gitea-runner -"
|
|
||||||
"d /var/lib/gitea-runner/infrastructure 0755 gitea-runner gitea-runner -"
|
|
||||||
];
|
|
||||||
|
|
||||||
# Override only the sandboxing settings, keep ExecStart from the module
|
|
||||||
systemd.services.gitea-runner-infrastructure.serviceConfig = {
|
systemd.services.gitea-runner-infrastructure.serviceConfig = {
|
||||||
# Keep the working directory
|
|
||||||
WorkingDirectory = lib.mkForce "/var/lib/gitea-runner/infrastructure";
|
WorkingDirectory = lib.mkForce "/var/lib/gitea-runner/infrastructure";
|
||||||
|
|
||||||
# Override user/group
|
|
||||||
User = lib.mkForce "gitea-runner";
|
User = lib.mkForce "gitea-runner";
|
||||||
Group = lib.mkForce "gitea-runner";
|
Group = lib.mkForce "gitea-runner";
|
||||||
|
|
||||||
# Remove ALL sandboxing - run as a normal user process
|
|
||||||
DynamicUser = lib.mkForce false;
|
DynamicUser = lib.mkForce false;
|
||||||
PrivateDevices = lib.mkForce false;
|
PrivateDevices = lib.mkForce false;
|
||||||
PrivateMounts = lib.mkForce false;
|
PrivateMounts = lib.mkForce false;
|
||||||
@@ -93,7 +78,6 @@ systemd.services.gitea-runner-infrastructure.serviceConfig = {
|
|||||||
ReadWritePaths = lib.mkForce [ ];
|
ReadWritePaths = lib.mkForce [ ];
|
||||||
BindReadOnlyPaths = lib.mkForce [ ];
|
BindReadOnlyPaths = lib.mkForce [ ];
|
||||||
|
|
||||||
# Allow access to devices
|
|
||||||
DeviceAllow = lib.mkForce [ "/dev/zfs rw" ];
|
DeviceAllow = lib.mkForce [ "/dev/zfs rw" ];
|
||||||
DevicePolicy = lib.mkForce "auto";
|
DevicePolicy = lib.mkForce "auto";
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user