yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

clanModules/syncthing-static-peers: Migrate to vars

Browse Source 
Part of the #2511 migration.
This commit is contained in:
a-kenji
2025-02-15 23:14:51 +07:00
parent 70ce6e5bd7
commit b561675af8
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
clanModules/syncthing-static-peers/default.nix
View File

@@ -7,7 +7,8 @@
let let
dir = config.clan.core.settings.directory; dir = config.clan.core.settings.directory;
machineDir = dir + "/machines/"; machineDir = dir + "/machines/";
syncthingPublicKeyPath = machines: machineDir + machines + "/facts/syncthing.pub"; machineVarDir = dir + "/vars/per-machine/";
syncthingPublicKeyPath = machines: machineVarDir + machines + "/syncthing/id/value";
machinesFileSet = builtins.readDir machineDir; machinesFileSet = builtins.readDir machineDir;
machines = lib.mapAttrsToList (name: _: name) machinesFileSet; machines = lib.mapAttrsToList (name: _: name) machinesFileSet;
syncthingPublicKeysUnchecked = builtins.map ( syncthingPublicKeysUnchecked = builtins.map (
@@ -83,24 +84,26 @@ in
configDir = "/var/lib/syncthing"; configDir = "/var/lib/syncthing";
group = "syncthing"; group = "syncthing";
key = lib.mkDefault config.clan.core.facts.services.syncthing.secret."syncthing.key".path or null; key = lib.mkDefault config.clan.core.vars.generators.syncthing.files.key.path or null;
cert = lib.mkDefault config.clan.core.facts.services.syncthing.secret."syncthing.cert".path or null; cert = lib.mkDefault config.clan.core.vars.generators.syncthing.files.cert.path or null;
}; };
clan.core.facts.services.syncthing = { clan.core.vars.generators.syncthing = {
secret."syncthing.key" = { }; files.key = { };
secret."syncthing.cert" = { }; files.cert = { };
public."syncthing.pub" = { }; files.api = { };
generator.path = [ files.id.secret = false;
runtimeInputs = [
pkgs.coreutils pkgs.coreutils
pkgs.gnugrep pkgs.gnugrep
pkgs.syncthing pkgs.syncthing
]; ];
generator.script = '' script = ''
syncthing generate --config "$secrets" syncthing generate --config $out
mv "$secrets"/key.pem "$secrets"/syncthing.key mv $out/key.pem $out/key
mv "$secrets"/cert.pem "$secrets"/syncthing.cert mv $out/cert.pem $out/cert
cat "$secrets"/config.xml | grep -oP '(?<=<device id=")[^"]+' | uniq > "$facts"/syncthing.pub cat $out/config.xml | grep -oP '(?<=<device id=")[^"]+' | uniq > $out/id
cat $out/config.xml | grep -oP '<apikey>\K[^<]+' | uniq > $out/api
''; '';
}; };
} }