syncthing: Allow the user service to be enabled with systemctl (#17136)

This commit is contained in:
Michele Guerini Rocco 2016-07-21 04:49:58 +02:00 committed by Franz Pletz
parent c4c75514a2
commit 267e362fbc

View File

@ -9,6 +9,7 @@ let
header = { header = {
description = "Syncthing service"; description = "Syncthing service";
after = [ "network.target" ];
environment = { environment = {
STNORESTART = "yes"; STNORESTART = "yes";
STNOUPGRADE = "yes"; STNOUPGRADE = "yes";
@ -113,9 +114,8 @@ in
environment.systemPackages = [ cfg.package ]; environment.systemPackages = [ cfg.package ];
systemd.services = mkIf cfg.systemService { systemd.services.syncthing = mkIf cfg.systemService
syncthing = header // { header // {
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
serviceConfig = service // { serviceConfig = service // {
User = cfg.user; User = cfg.user;
@ -124,14 +124,14 @@ in
ExecStart = "${cfg.package}/bin/syncthing -no-browser -home=${cfg.dataDir}"; ExecStart = "${cfg.package}/bin/syncthing -no-browser -home=${cfg.dataDir}";
}; };
}; };
};
systemd.user.services = { systemd.user.services.syncthing =
syncthing = header // { header // {
wantedBy = [ "default.target" ];
serviceConfig = service // { serviceConfig = service // {
ExecStart = "${cfg.package}/bin/syncthing -no-browser"; ExecStart = "${cfg.package}/bin/syncthing -no-browser";
}; };
}; };
};
}; };
} }