diff options
| author | tv <tv@krebsco.de> | 2020-08-04 20:28:04 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2020-08-05 11:01:30 +0200 |
| commit | b5b90b598430cfa876639d76dbbdc8d826ccb5c0 (patch) | |
| tree | a302c834b859111bd2061e2c52d9e91c052d2a98 /lass | |
| parent | 087fff54f11d28c9a08849c70520ecf9030f4ce9 (diff) | |
types.secret-file: add service option
Diffstat (limited to 'lass')
| -rw-r--r-- | lass/2configs/binary-cache/server.nix | 8 | ||||
| -rw-r--r-- | lass/2configs/websites/sqlBackup.nix | 8 | ||||
| -rw-r--r-- | lass/3modules/ejabberd/default.nix | 11 |
3 files changed, 21 insertions, 6 deletions
diff --git a/lass/2configs/binary-cache/server.nix b/lass/2configs/binary-cache/server.nix index d3775b5d..fbaf16a3 100644 --- a/lass/2configs/binary-cache/server.nix +++ b/lass/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/lass/2configs/websites/sqlBackup.nix b/lass/2configs/websites/sqlBackup.nix index 10a6e464..72d7c7b9 100644 --- a/lass/2configs/websites/sqlBackup.nix +++ b/lass/2configs/websites/sqlBackup.nix @@ -14,8 +14,12 @@ }; systemd.services.mysql = { - requires = [ "secret.service" ]; - after = [ "secret.service" ]; + after = [ + config.krebs.secret.files.mysql_rootPassword.service + ]; + requires = [ + config.krebs.secret.files.mysql_rootPassword.service + ]; }; lass.mysqlBackup = { diff --git a/lass/3modules/ejabberd/default.nix b/lass/3modules/ejabberd/default.nix index 4838a909..9642c64c 100644 --- a/lass/3modules/ejabberd/default.nix +++ b/lass/3modules/ejabberd/default.nix @@ -74,8 +74,15 @@ in { systemd.services.ejabberd = { wantedBy = [ "multi-user.target" ]; - requires = [ "secret.service" ]; - after = [ "network.target" "secret.service" ]; + after = [ + config.krebs.secret.files.ejabberd-certfile.service + config.krebs.secret.files.ejabberd-s2s_certfile.service + "network.target" + ]; + requires = [ + config.krebs.secret.files.ejabberd-certfile.service + config.krebs.secret.files.ejabberd-s2s_certfile.service + ]; serviceConfig = { ExecStartPre = "${gen-dhparam} ${cfg.dhfile.path}"; ExecStart = "${cfg.pkgs.ejabberdctl}/bin/ejabberdctl foreground"; |