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 /lass/3modules | |
| parent | 04d9ff2dcdc039518391fcb41ffbb256e2f4ba23 (diff) | |
| parent | 42df7da046f46efaca0cb0243a6de3aff599c8aa (diff) | |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'lass/3modules')
| -rw-r--r-- | lass/3modules/ejabberd/default.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lass/3modules/ejabberd/default.nix b/lass/3modules/ejabberd/default.nix index 4838a9093..20a38d572 100644 --- a/lass/3modules/ejabberd/default.nix +++ b/lass/3modules/ejabberd/default.nix @@ -17,6 +17,7 @@ in { certfile = mkOption { type = types.secret-file; default = { + name = "ejabberd-certfile"; path = "${cfg.user.home}/ejabberd.pem"; owner = cfg.user; source-path = "/var/lib/acme/lassul.us/full.pem"; @@ -25,6 +26,7 @@ in { dhfile = mkOption { type = types.secret-file; default = { + name = "ejabberd-dhfile"; path = "${cfg.user.home}/dhparams.pem"; owner = cfg.user; source-path = "/dev/null"; @@ -74,8 +76,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" + ]; + partOf = [ + 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"; |