nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 15:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

syncthing service: fix invalid conflict resolution

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-04-14 17:38:25 +03:00
parent 37d641ff3d
commit c9f2753c7b
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nixos/modules/services/networking/syncthing.nix
View File

@ -113,22 +113,6 @@ in
config.ids.gids.syncthing;
};
systemd.services.syncthing =
{
description = "Syncthing service";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
environment = {
STNORESTART = "yes"; # do not self-restart
STNOUPGRADE = "yes";
inherit (cfg) all_proxy;
} // config.networking.proxy.envVars;
serviceConfig = {
User = cfg.user;
Group = cfg.group;
};
environment.systemPackages = [ cfg.package ];
systemd.services = mkIf cfg.systemService {