From dc5418f3aa243f79a9a0e8d888000a4239d60542 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Wed, 5 Jun 2024 17:26:42 +0200 Subject: [PATCH] fixing syncthing (again) --- nixos/components/network/syncthing.nix | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/nixos/components/network/syncthing.nix b/nixos/components/network/syncthing.nix index da8a625..08d49ea 100644 --- a/nixos/components/network/syncthing.nix +++ b/nixos/components/network/syncthing.nix @@ -5,29 +5,12 @@ with lib; { clanCore.facts.services.syncthing = factsGenerator.syncthing { }; - systemd.tmpfiles.settings.syncthing = { - "/run/facts/syncthing.key".C = { - type = "C"; - user = config.services.syncthing.user; - group = config.services.syncthing.group; - mode = "400"; - argument = config.clanCore.facts.services.syncthing.secret."syncthing.key".path; - }; - "/run/facts/syncthing.cert".C = { - type = "C"; - user = config.services.syncthing.user; - group = config.services.syncthing.group; - mode = "400"; - argument = config.clanCore.facts.services.syncthing.secret."syncthing.cert".path; - }; - }; - services.syncthing = { #guiAddress = lib.mkDefault "${config.networking.hostName}.${ config.clan.static-hosts.topLevelDomain }:8384"; guiAddress = lib.mkDefault "${config.networking.hostName}.private:8384"; overrideDevices = lib.mkDefault true; - key = "/run/facts/syncthing.key"; - cert = "/run/facts/syncthing.cert"; + key = config.clanCore.facts.services.syncthing.secret."syncthing.key".path; + cert = config.clanCore.facts.services.syncthing.secret."syncthing.cert".path; settings.devices = let machineDir = "${config.clanCore.clanDir}/machines";