public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #52852 from jokogr/f/syncthing-service

Browse Source 
syncthing: Fix systemd service
This commit is contained in:
Silvan Mosberger 2019-02-06 20:27:35 +01:00 committed by GitHub
commit 08870eeee9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,7 +122,7 @@ in {
systemd.packages = [ pkgs.syncthing ];
users = mkIf (cfg.user == defaultUser) {
users = mkIf (cfg.systemService && cfg.user == defaultUser) {
users."${defaultUser}" =
{ group = cfg.group;
home = cfg.dataDir;

14
pkgs/applications/networking/syncthing/default.nix
View File

@ -63,19 +63,19 @@ in {
done
'' + lib.optionalString (stdenv.isLinux) ''
mkdir -p $out/lib/systemd/{system,user}
mkdir -p $bin/lib/systemd/{system,user}
substitute etc/linux-systemd/system/syncthing-resume.service \
$out/lib/systemd/system/syncthing-resume.service \
$bin/lib/systemd/system/syncthing-resume.service \
--replace /usr/bin/pkill ${procps}/bin/pkill
substitute etc/linux-systemd/system/syncthing@.service \
$out/lib/systemd/system/syncthing@.service \
--replace /usr/bin/syncthing $out/bin/syncthing
$bin/lib/systemd/system/syncthing@.service \
--replace /usr/bin/syncthing $bin/bin/syncthing
substitute etc/linux-systemd/user/syncthing.service \
$out/lib/systemd/user/syncthing.service \
--replace /usr/bin/syncthing $out/bin/syncthing
$bin/lib/systemd/user/syncthing.service \
--replace /usr/bin/syncthing $bin/bin/syncthing
'';
};
@ -99,7 +99,7 @@ in {
substitute cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
$out/lib/systemd/system/strelaysrv.service \
--replace /usr/bin/strelaysrv $out/bin/strelaysrv
--replace /usr/bin/strelaysrv $bin/bin/strelaysrv
'';
};
}