diff --git a/modules/config/instances/config/syncthing.nix b/modules/config/instances/config/syncthing.nix index bbb8e0e..b18d577 100755 --- a/modules/config/instances/config/syncthing.nix +++ b/modules/config/instances/config/syncthing.nix @@ -2,7 +2,7 @@ let inherit (moduleFunctions.instancesFunctions) domain0 - servicePath + varLib sslPath sopsPath synologyName @@ -20,7 +20,7 @@ in path0 = "${sopsPath}/${name}"; }; paths = { - path0 = "${servicePath}/${name}"; + path0 = "${varLib}/${name}"; }; domains = { url0 = domain; diff --git a/modules/nixos/services/forgejo/default.nix b/modules/nixos/services/forgejo/default.nix index 4373f8f..0c63fd9 100755 --- a/modules/nixos/services/forgejo/default.nix +++ b/modules/nixos/services/forgejo/default.nix @@ -113,7 +113,8 @@ in }; }; forgejo.serviceConfig.ExecStartPre = [ - "+${pkgs.coreutils}/bin/chgrp ${syncthing.name} ${backupPath}" + "+${pkgs.coreutils}/bin/mkdir -p ${backupPath}" + "+${pkgs.coreutils}/bin/chown ${service.name}:${syncthing.name} ${backupPath}" "+${pkgs.coreutils}/bin/chmod 0750 ${backupPath}" ]; }; @@ -121,9 +122,6 @@ in systemd.tmpfiles.rules = [ "Z ${service.paths.path0} 755 ${service.name} ${service.name} -" "Z ${service.sops.path0} 755 ${service.name} ${service.name} -" - - "d ${backupPath} 0750 ${service.name} ${syncthing.name} -" - ]; users.users.${service.name}.extraGroups = [