ashie/nixos-vps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix EnvironmentFile merge with mkMerge

Browse source
This commit is contained in:
ashisgreat22 2026-03-17 21:26:51 +01:00
parent 2dd8ef2797
commit d7c3bd0775
1 changed files with 30 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/openclaw.nix
View file

@ -75,7 +75,8 @@ in
after = [ "network.target" ]; after = [ "network.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
serviceConfig = { serviceConfig = lib.mkMerge [
{
Type = "simple"; Type = "simple";
User = "openclaw"; User = "openclaw";
Group = "openclaw"; Group = "openclaw";
@ -89,8 +90,6 @@ in
"PATH=${pkgs.nodejs_22}/bin:${pkgs.git}/bin:${pkgs.bash}/bin:${pkgs.coreutils}/bin" "PATH=${pkgs.nodejs_22}/bin:${pkgs.git}/bin:${pkgs.bash}/bin:${pkgs.coreutils}/bin"
]; ];
EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
ExecStartPre = [ ExecStartPre = [
"${pkgs.coreutils}/bin/mkdir -p ${configDir} ${dataDir} ${workspaceDir}" "${pkgs.coreutils}/bin/mkdir -p ${configDir} ${dataDir} ${workspaceDir}"
"${pkgs.bash}/bin/bash -c 'cp -n /etc/openclaw/openclaw.json ${configDir}/ || true'" "${pkgs.bash}/bin/bash -c 'cp -n /etc/openclaw/openclaw.json ${configDir}/ || true'"
@ -106,7 +105,11 @@ in
ProtectSystem = "strict"; ProtectSystem = "strict";
ReadWritePaths = [ "/var/lib/openclaw" configDir dataDir workspaceDir ]; ReadWritePaths = [ "/var/lib/openclaw" configDir dataDir workspaceDir ];
NoNewPrivileges = true; NoNewPrivileges = true;
}; }
(lib.mkIf (cfg.environmentFile != null) {
EnvironmentFile = cfg.environmentFile;
})
];
}; };
}; };
} }