From cf46256bbbf559f8cc0c8c9c8a6dd7fdb0af82fd Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 12 Apr 2016 06:33:04 +0200
Subject: [PATCH] nixos/taskserver: Improve service dependencies

Using requiredBy is a bad idea for the initialisation units, because
whenever the Taskserver service is restarted the initialisation units
get restarted as well.

Also, make sure taskserver-init.service will be ordered *before*
taskserver.service.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/services/misc/taskserver/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix
index e0e94dac48f..261d4d4d4b0 100644
--- a/nixos/modules/services/misc/taskserver/default.nix
+++ b/nixos/modules/services/misc/taskserver/default.nix
@@ -395,7 +395,8 @@ in {
       };
 
       systemd.services.taskserver-init = {
-        requiredBy = [ "taskserver.service" ];
+        wantedBy = [ "taskserver.service" ];
+        before = [ "taskserver.service" ];
         description = "Initialize Taskserver Data Directory";
 
         preStart = ''
@@ -449,7 +450,7 @@ in {
     })
     (mkIf needToCreateCA {
       systemd.services.taskserver-ca = {
-        requiredBy = [ "taskserver.service" ];
+        wantedBy = [ "taskserver.service" ];
         after = [ "taskserver-init.service" ];
         before = [ "taskserver.service" ];
         description = "Initialize CA for TaskServer";