diff options
| author | makefu <github@syntax-fehler.de> | 2020-08-11 12:12:13 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2020-08-11 12:12:13 +0200 |
| commit | 4cb0ff12ba563693b6be7aac3c7cc8c6ce7a003c (patch) | |
| tree | 2eceb32d72c1799938bce57240566ba576c2c3b4 /makefu | |
| parent | 93606315b99a2540c5859d93eb2377ae32fa6506 (diff) | |
| parent | f556a302f62434e0a47ef23db7e569bdb9c489f6 (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'makefu')
| -rw-r--r-- | makefu/2configs/binary-cache/server.nix | 8 | ||||
| -rw-r--r-- | makefu/3modules/netdata.nix | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/makefu/2configs/binary-cache/server.nix b/makefu/2configs/binary-cache/server.nix index c8f68c84d..1d729b9bb 100644 --- a/makefu/2configs/binary-cache/server.nix +++ b/makefu/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 + ]; + partOf = [ + config.krebs.secret.files.nix-serve-key.service + ]; }; krebs.secret.files.nix-serve-key = { path = "/run/secret/nix-serve.key"; diff --git a/makefu/3modules/netdata.nix b/makefu/3modules/netdata.nix index 3ed33643c..bfa6f404c 100644 --- a/makefu/3modules/netdata.nix +++ b/makefu/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 + ]; + partOf = [ + config.krebs.secret.files.netdata-stream.service + ]; }; krebs.secret.files.netdata-stream = { path = "/run/secret/netdata-stream.conf"; |