diff options
| author | lassulus <lassulus@lassul.us> | 2020-08-06 23:24:29 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2020-08-06 23:24:29 +0200 |
| commit | e0e91cfd74c9ce5d3f9ce9c2e2efab322a00f960 (patch) | |
| tree | f17565a1d7bc496b0b439ff45010f3f9c91c6d4f /krebs/3modules/exim-smarthost.nix | |
| parent | 04d9ff2dcdc039518391fcb41ffbb256e2f4ba23 (diff) | |
| parent | 42df7da046f46efaca0cb0243a6de3aff599c8aa (diff) | |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'krebs/3modules/exim-smarthost.nix')
| -rw-r--r-- | krebs/3modules/exim-smarthost.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/krebs/3modules/exim-smarthost.nix b/krebs/3modules/exim-smarthost.nix index e988fb563..c5969caac 100644 --- a/krebs/3modules/exim-smarthost.nix +++ b/krebs/3modules/exim-smarthost.nix @@ -26,6 +26,7 @@ let private_key = mkOption { type = types.secret-file; default = { + name = "exim.dkim_private_key/${config.domain}"; path = "/run/krebs.secret/${config.domain}.dkim_private_key"; owner.name = "exim"; source-path = toString <secrets> + "/${config.domain}.dkim.priv"; @@ -115,8 +116,12 @@ let })); systemd.services = mkIf (cfg.dkim != []) { exim = { - after = [ "secret.service" ]; - requires = [ "secret.service" ]; + after = flip map cfg.dkim (dkim: + config.krebs.secret.files."exim.dkim_private_key/${dkim.domain}".service + ); + partOf = flip map cfg.dkim (dkim: + config.krebs.secret.files."exim.dkim_private_key/${dkim.domain}".service + ); }; }; krebs.exim = { |