summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2020-08-04 20:28:04 +0200
committertv <tv@krebsco.de>2020-08-05 11:01:30 +0200
commitc58835f0e36d9bb0fa57b077aea7556f16afc5e5 (patch)
treedc2fefbdfa9bbff9c57b7e4af871c28ad884ff8d
parent45db34b85f6251ad840f00b34c5b7a9dc393f6fe (diff)
types.secret-file: add service option
-rw-r--r--2configs/binary-cache/server.nix8
-rw-r--r--3modules/netdata.nix8
2 files changed, 12 insertions, 4 deletions
diff --git a/2configs/binary-cache/server.nix b/2configs/binary-cache/server.nix
index c8f68c84d..3fc174a1b 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 3ed33643c..a3c789eb2 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";