nbot: bump to a6451cb and set the new drive and cluster flags
nbot 8daeca5 -> a6451cb (revCount 492 -> 652). The two config shape changes in that range are allow_subdir on a drive and master_fingerprint as a list; summaries.enabled is now ignored because summaries are always on. The host module gained drives and stateDir, which feed RequiresMountsFor= so the unit waits for its disks. The nbot input stays on git+ssh: the repo is private, so git+https cannot fetch it without credentials.
This commit is contained in:
1 parent
91d6511f01
commit
eb94f5a034
3 files changed
+20
-8
No files matched your search
Generated
+4
-4
@@ -2204,11 +2204,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1793984825,
|
"lastModified": 1794057087,
|
||||||
"narHash": "sha256-cmhGM7E19/QM4BLj4SXfML32EUe8DOrzo6wDGjV5QLI=",
|
"narHash": "sha256-UlrEHt0pFD2AXuleAKUmf6lD2Pih8+jCbxWxpEz05LA=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "8daeca5189778c9d08f83519c07e08c6de95c605",
|
"rev": "a6451cb0fa240d23f280c991d3d21e2784618b42",
|
||||||
"revCount": 492,
|
"revCount": 652,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://git@github.com/asosnovsky/nbot.git"
|
"url": "ssh://git@github.com/asosnovsky/nbot.git"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -15,8 +15,8 @@ let
|
|||||||
allow_indefinite = true;
|
allow_indefinite = true;
|
||||||
boot_timeout = "2m";
|
boot_timeout = "2m";
|
||||||
|
|
||||||
|
# Summaries are always on now; only the model and its timeout are set.
|
||||||
summaries = {
|
summaries = {
|
||||||
enabled = true;
|
|
||||||
timeout = "10s";
|
timeout = "10s";
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -92,7 +92,10 @@ let
|
|||||||
max_container = { memory_mb = 16384; cpus = 4; };
|
max_container = { memory_mb = 16384; cpus = 4; };
|
||||||
host_reserve = { memory_mb = 32768; cpus = 4.0; };
|
host_reserve = { memory_mb = 32768; cpus = 4.0; };
|
||||||
storage = { min = "2G"; max = "5G"; limit = "20G"; };
|
storage = { min = "2G"; max = "5G"; limit = "20G"; };
|
||||||
drives = [{ path = homes; reserve = "40G"; }];
|
# allow_subdir: the folder is a plain folder on the /data disk. The unit
|
||||||
|
# waits for that disk (services.nbot.drives), which is what the check in
|
||||||
|
# nbot is for.
|
||||||
|
drives = [{ path = homes; reserve = "40G"; allow_subdir = true; }];
|
||||||
|
|
||||||
cluster = {
|
cluster = {
|
||||||
node_secrets = { hl-fws1 = "$HL_FWS1_CLUSTER_SECRET"; };
|
node_secrets = { hl-fws1 = "$HL_FWS1_CLUSTER_SECRET"; };
|
||||||
@@ -118,6 +121,9 @@ in
|
|||||||
enable = true;
|
enable = true;
|
||||||
mode = "master";
|
mode = "master";
|
||||||
clusterPort = ports.cluster;
|
clusterPort = ports.cluster;
|
||||||
|
# The unit waits for these mounts before it starts.
|
||||||
|
drives = [ homes ];
|
||||||
|
stateDir = "/var/lib/nbot";
|
||||||
configFile = (pkgs.formats.toml { }).generate "nbot.toml" settings;
|
configFile = (pkgs.formats.toml { }).generate "nbot.toml" settings;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,8 @@ let
|
|||||||
max_container = { memory_mb = 51200; cpus = 6; };
|
max_container = { memory_mb = 51200; cpus = 6; };
|
||||||
host_reserve = { memory_mb = 8192; cpus = 2.0; };
|
host_reserve = { memory_mb = 8192; cpus = 2.0; };
|
||||||
storage = { min = "2G"; max = "10G"; limit = "50G"; };
|
storage = { min = "2G"; max = "10G"; limit = "50G"; };
|
||||||
drives = [{ path = homes; reserve = "200G"; }];
|
# allow_subdir: the folder is a plain folder on the root disk.
|
||||||
|
drives = [{ path = homes; reserve = "200G"; allow_subdir = true; }];
|
||||||
|
|
||||||
# Worker of the master on fwdesk. Slack tokens and goose settings come
|
# Worker of the master on fwdesk. Slack tokens and goose settings come
|
||||||
# from the master. Trusts the first certificate it sees (saved in
|
# from the master. Trusts the first certificate it sees (saved in
|
||||||
@@ -25,7 +26,9 @@ let
|
|||||||
cluster = {
|
cluster = {
|
||||||
name = "hl-fws1";
|
name = "hl-fws1";
|
||||||
master = "wss://fwdesk.lab.internal:7946";
|
master = "wss://fwdesk.lab.internal:7946";
|
||||||
master_fingerprint = "ce08c6b0f3aec855cc8b936d81449c1a34074d181089b26acbdddacfca60af1d";
|
# A list, so the master's certificate can be rotated with no time where
|
||||||
|
# a slave refuses the master: add the new fingerprint, then drop the old.
|
||||||
|
master_fingerprint = [ "ce08c6b0f3aec855cc8b936d81449c1a34074d181089b26acbdddacfca60af1d" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
@@ -40,6 +43,9 @@ in
|
|||||||
services.nbot = {
|
services.nbot = {
|
||||||
enable = true;
|
enable = true;
|
||||||
mode = "slave";
|
mode = "slave";
|
||||||
|
# The unit waits for these mounts before it starts.
|
||||||
|
drives = [ homes ];
|
||||||
|
stateDir = "/var/lib/nbot";
|
||||||
configFile = (pkgs.formats.toml { }).generate "nbot.toml" settings;
|
configFile = (pkgs.formats.toml { }).generate "nbot.toml" settings;
|
||||||
environmentFile = config.age.secrets.nbot-cluster.path;
|
environmentFile = config.age.secrets.nbot-cluster.path;
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in new issue
Block a user