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 /tv/3modules/charybdis/default.nix | |
parent | 93606315b99a2540c5859d93eb2377ae32fa6506 (diff) | |
parent | f556a302f62434e0a47ef23db7e569bdb9c489f6 (diff) |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'tv/3modules/charybdis/default.nix')
-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 62a7037e..a0638e1e 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"; }; |