openclaw/clawdinators
openclaw/clawdinators
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use nix-openclaw NixOS module for gateway service

Browse Source 
- Import nix-openclaw nixosModules.openclaw-gateway
- Replace custom systemd gateway service with upstream module
- Let upstream module own /etc/clawd/openclaw.json generation

This reduces duplication between clawdinators and nix-openclaw and aligns config merge semantics.
This commit is contained in:
joshp123 2026-02-15 14:56:00 -08:00
parent c0794f84e2
commit fda12f98cb
3 changed files with 54 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flake.lock generated
View File

@ -111,11 +111,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1770325501,
"narHash": "sha256-JuSpPoFFIbC0lWLDjfRLLmBnP3NN/11KYiZn+I5bFME=",
"lastModified": 1771194720,
"narHash": "sha256-QUzmFg/mhKLaHkYChvACziA7MdMVy41v7wQwrFLOVT8=",
"owner": "openclaw",
"repo": "nix-openclaw",
"rev": "f9ad193d28d4162282f88b5d2355c652561e79ff",
"rev": "2a9a3be47b851540bbf647e509fddf0b41bf2780",
"type": "github"
},
"original": {
@ -129,11 +129,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1770240566,
"narHash": "sha256-fY8t41kMSHu2ovf89mIdvC7vkceroCwKxw/MKVn4rsE=",
"lastModified": 1771128277,
"narHash": "sha256-wcVJ9uvHx7KZTezCG6IedeRnJFsHF9Oaej+l8XC2wYM=",
"owner": "openclaw",
"repo": "nix-steipete-tools",
"rev": "983210e3b6e9285780e87f48ce9354b51a270e95",
"rev": "90516869c19a49f0434787277a9458436867a53b",
"type": "github"
},
"original": {

4
flake.nix
View File

@ -46,6 +46,7 @@
modules = [
({ ... }: { nixpkgs.overlays = [ self.overlays.default ]; })
agenix.nixosModules.default
nix-openclaw.nixosModules.openclaw-gateway
./nix/hosts/clawdinator-1.nix
];
};
@ -55,6 +56,7 @@
modules = [
({ ... }: { nixpkgs.overlays = [ self.overlays.default ]; })
agenix.nixosModules.default
nix-openclaw.nixosModules.openclaw-gateway
./nix/hosts/clawdinator-2.nix
];
};
@ -64,6 +66,7 @@
modules = [
({ ... }: { nixpkgs.overlays = [ self.overlays.default ]; })
agenix.nixosModules.default
nix-openclaw.nixosModules.openclaw-gateway
./nix/hosts/clawdinator-babelfish.nix
];
};
@ -73,6 +76,7 @@
modules = [
({ ... }: { nixpkgs.overlays = [ self.overlays.default ]; })
agenix.nixosModules.default
nix-openclaw.nixosModules.openclaw-gateway
./nix/hosts/clawdinator-1-image.nix
];
};

85
nix/modules/clawdinator.nix
View File

@ -11,11 +11,6 @@ let
merge = _loc: defs: lib.foldl' lib.recursiveUpdate {} (map (d: d.value) defs);
};
configSource =
if cfg.configFile != null
then cfg.configFile
else pkgs.writeText "openclaw.json" (builtins.toJSON cfg.config);
updateScript = pkgs.writeShellScript "clawdinator-self-update" ''
set -euo pipefail
@ -556,7 +551,6 @@ in
(pkgs.writeShellScriptBin "clawdinator-gh-refresh" ''exec ${githubTokenScript}'')
];
environment.etc."clawd/openclaw.json".source = configSource;
environment.etc."clawd/cron-jobs.json" = lib.mkIf (cfg.cronJobsFile != null) {
source = cfg.cronJobsFile;
mode = "0644";
@ -684,9 +678,52 @@ in
};
};
# Gateway service is implemented upstream in nix-openclaw.
services.openclaw-gateway = {
enable = true;
unitName = "clawdinator";
package = cfg.package;
port = cfg.gatewayPort;
user = cfg.user;
group = cfg.group;
createUser = false;
stateDir = cfg.stateDir;
workingDirectory = cfg.stateDir;
configPath = configPath;
config = cfg.config;
configFile = cfg.configFile;
logPath = "${logDir}/gateway.log";
# Additional env beyond OPENCLAW_* and CLAWDBOT_* defaults.
environment = {
CLAWDBOT_WORKSPACE_DIR = workspaceDir;
CLAWDBOT_LOG_DIR = logDir;
GH_CONFIG_DIR = ghConfigDir;
# Backward-compatible env names used by some builds.
CLAWDIS_CONFIG_PATH = configPath;
CLAWDIS_STATE_DIR = cfg.stateDir;
};
servicePath = [ pkgs.coreutils pkgs.git pkgs.rsync ] ++ toolchain.packages;
execStartPre =
lib.optionals (cfg.repoSeedSnapshotDir == null) [
"${pkgs.bash}/bin/bash ${../../scripts/seed-repos.sh} ${repoSeedsFile} ${repoSeedBaseDir}"
]
++ [
"${pkgs.bash}/bin/bash ${../../scripts/seed-workspace.sh} ${cfg.workspaceTemplateDir} ${workspaceDir}"
];
execStart =
if tokenWrapper != null
then "${tokenWrapper}/bin/clawdinator-gateway"
else "${gatewayBin} gateway --port ${toString cfg.gatewayPort}";
};
# Add CLAWDINATOR-specific dependencies to the upstream gateway unit.
systemd.services.clawdinator = {
description = "CLAWDINATOR (Moltbot gateway)";
wantedBy = [ "multi-user.target" ];
after =
[ "network.target" ]
++ lib.optional cfg.bootstrap.enable "clawdinator-bootstrap.service"
@ -700,40 +737,6 @@ in
++ lib.optional cfg.githubApp.enable "clawdinator-github-app-token.service"
++ lib.optional (cfg.repoSeedSnapshotDir != null) "clawdinator-repo-seed.service"
++ lib.optional (cfg.openaiApiKeyFile != null && cfg.anthropicApiKeyFile != null) "clawdinator-pi-auth.service";
environment = {
CLAWDBOT_CONFIG_PATH = configPath;
CLAWDBOT_STATE_DIR = cfg.stateDir;
CLAWDBOT_WORKSPACE_DIR = workspaceDir;
CLAWDBOT_LOG_DIR = logDir;
GH_CONFIG_DIR = ghConfigDir;
# Backward-compatible env names used by some builds.
CLAWDIS_CONFIG_PATH = configPath;
CLAWDIS_STATE_DIR = cfg.stateDir;
};
path = [ pkgs.coreutils pkgs.git pkgs.rsync ] ++ toolchain.packages;
serviceConfig = {
User = cfg.user;
Group = cfg.group;
WorkingDirectory = cfg.stateDir;
ExecStartPre =
lib.optionals (cfg.repoSeedSnapshotDir == null) [
"${pkgs.bash}/bin/bash ${../../scripts/seed-repos.sh} ${repoSeedsFile} ${repoSeedBaseDir}"
]
++ [
"${pkgs.bash}/bin/bash ${../../scripts/seed-workspace.sh} ${cfg.workspaceTemplateDir} ${workspaceDir}"
];
ExecStart =
if tokenWrapper != null
then "${tokenWrapper}/bin/clawdinator-gateway"
else "${gatewayBin} gateway --port ${toString cfg.gatewayPort}";
Restart = "always";
RestartSec = 2;
StandardOutput = "append:${logDir}/gateway.log";
StandardError = "append:${logDir}/gateway.log";
};
};
systemd.services.clawdinator-repo-seed = lib.mkIf (cfg.repoSeedSnapshotDir != null) {