From 267e362fbc41dffd0d978ab5c8d91668b5d7d8fc Mon Sep 17 00:00:00 2001
From: Michele Guerini Rocco <rnhmjoj@users.noreply.github.com>
Date: Thu, 21 Jul 2016 04:49:58 +0200
Subject: syncthing: Allow the user service to be enabled with systemctl
 (#17136)

---
 nixos/modules/services/networking/syncthing.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'nixos')

diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index ef05e71ce076..98f4faabba26 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -9,6 +9,7 @@ let
 
   header = {
     description = "Syncthing service";
+    after = [ "network.target" ];
     environment = {
       STNORESTART = "yes";
       STNOUPGRADE = "yes";
@@ -113,9 +114,8 @@ in
 
     environment.systemPackages = [ cfg.package ];
 
-    systemd.services = mkIf cfg.systemService {
-      syncthing = header // {
-        after = [ "network.target" ];
+    systemd.services.syncthing = mkIf cfg.systemService
+      header // {
         wantedBy = [ "multi-user.target" ];
         serviceConfig = service // {
           User = cfg.user;
@@ -124,14 +124,14 @@ in
           ExecStart = "${cfg.package}/bin/syncthing -no-browser -home=${cfg.dataDir}";
         };
       };
-    };
 
-    systemd.user.services =  {
-      syncthing = header // {
+    systemd.user.services.syncthing =
+      header // {
+        wantedBy = [ "default.target" ];
         serviceConfig = service // {
           ExecStart = "${cfg.package}/bin/syncthing -no-browser";
         };
       };
-    };
+
   };
 }
-- 
cgit 1.4.1