From c58835f0e36d9bb0fa57b077aea7556f16afc5e5 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 4 Aug 2020 20:28:04 +0200
Subject: [PATCH] types.secret-file: add service option

---
 2configs/binary-cache/server.nix | 8 ++++++--
 3modules/netdata.nix             | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/2configs/binary-cache/server.nix b/2configs/binary-cache/server.nix
index c8f68c8..3fc174a 100644
--- a/2configs/binary-cache/server.nix
+++ b/2configs/binary-cache/server.nix
@@ -9,8 +9,12 @@
   };
 
   systemd.services.nix-serve = {
-    requires = ["secret.service"];
-    after = ["secret.service"];
+    after = [
+      config.krebs.secret.files.nix-serve-key.service
+    ];
+    requires = [
+      config.krebs.secret.files.nix-serve-key.service
+    ];
   };
   krebs.secret.files.nix-serve-key = {
     path = "/run/secret/nix-serve.key";
diff --git a/3modules/netdata.nix b/3modules/netdata.nix
index 3ed3364..a3c789e 100644
--- a/3modules/netdata.nix
+++ b/3modules/netdata.nix
@@ -71,8 +71,12 @@ in
   };
   config = mkIf cfg.enable {
     systemd.services.netdata = {
-      requires = [ "secret.service" ];
-      after = [ "secret.service" ];
+      after = [
+        config.krebs.secret.files.netdata-stream.service
+      ];
+      requires = [
+        config.krebs.secret.files.netdata-stream.service
+      ];
     };
     krebs.secret.files.netdata-stream = {
       path = "/run/secret/netdata-stream.conf";