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 /tv/3modules/charybdis | |
| parent | 04d9ff2dcdc039518391fcb41ffbb256e2f4ba23 (diff) | |
| parent | 42df7da046f46efaca0cb0243a6de3aff599c8aa (diff) | |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv/3modules/charybdis')
| -rw-r--r-- | tv/3modules/charybdis/default.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/tv/3modules/charybdis/default.nix b/tv/3modules/charybdis/default.nix index 62a7037e3..a0638e1eb 100644 --- a/tv/3modules/charybdis/default.nix +++ b/tv/3modules/charybdis/default.nix @@ -17,6 +17,7 @@ in { ssl_dh_params = mkOption { type = types.secret-file; default = { + name = "charybdis-ssl_dh_params"; path = "${cfg.user.home}/dh.pem"; owner = cfg.user; source-path = toString <secrets> + "/charybdis.dh.pem"; @@ -25,6 +26,7 @@ in { ssl_private_key = mkOption { type = types.secret-file; default = { + name = "charybdis-ssl_private_key"; path = "${cfg.user.home}/ssl.key.pem"; owner = cfg.user; source-path = toString <secrets> + "/charybdis.key.pem"; @@ -51,8 +53,15 @@ in { systemd.services.charybdis = { wantedBy = [ "multi-user.target" ]; - requires = [ "secret.service" ]; - after = [ "network-online.target" "secret.service" ]; + after = [ + config.krebs.secret.files.charybdis-ssl_dh_params.service + config.krebs.secret.files.charybdis-ssl_private_key.service + "network-online.target" + ]; + partOf = [ + config.krebs.secret.files.charybdis-ssl_dh_params.service + config.krebs.secret.files.charybdis-ssl_private_key.service + ]; environment = { BANDB_DBPATH = "${cfg.user.home}/ban.db"; }; |