Merge pull request 'syncthing: update facts to new system' (#1580) from kenji/clan-core:syncthing/update into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/1580
This commit is contained in:
kenji
2024-06-06 08:21:31 +00:00

View File

@@ -27,7 +27,7 @@ let
}) syncthingPublicKeyMachines; }) syncthingPublicKeyMachines;
in in
{ {
options.clan.static-syncthing-peers = { options.clan.syncthing-static-peers = {
excludeMachines = lib.mkOption { excludeMachines = lib.mkOption {
type = lib.types.listOf lib.types.str; type = lib.types.listOf lib.types.str;
example = [ config.clanCore.machineName ]; example = [ config.clanCore.machineName ];
@@ -66,8 +66,8 @@ in
configDir = "/var/lib/syncthing"; configDir = "/var/lib/syncthing";
group = "syncthing"; group = "syncthing";
key = lib.mkDefault config.clan.secrets.syncthing.secrets."syncthing.key".path or null; key = lib.mkDefault config.clanCore.facts.services.syncthing.secret."syncthing.key".path or null;
cert = lib.mkDefault config.clan.secrets.syncthing.secrets."syncthing.cert".path or null; cert = lib.mkDefault config.clanCore.facts.services.syncthing.secret."syncthing.cert".path or null;
}; };
clanCore.facts.services.syncthing = { clanCore.facts.services.syncthing = {