public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/rspamd: Add defaults for rspamd_proxy worker

Browse Source
This commit is contained in:
Brian Olsen 2018-11-06 00:32:14 +01:00
parent 3a4459a305
commit 46ef075e7d
No known key found for this signature in database
GPG Key ID: 029DD8E8B95882E8
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
nixos/modules/services/mail/rspamd.nix
View File

@ -58,7 +58,7 @@ let
}; };
type = mkOption { type = mkOption {
type = types.nullOr (types.enum [ type = types.nullOr (types.enum [
"normal" "controller" "fuzzy_storage" "proxy" "lua" "normal" "controller" "fuzzy_storage" "rspamd_proxy" "lua"
]); ]);
description = "The type of this worker"; description = "The type of this worker";
}; };
@ -99,19 +99,21 @@ let
description = "Additional entries to put verbatim into worker section of rspamd config file."; description = "Additional entries to put verbatim into worker section of rspamd config file.";
}; };
}; };
config = mkIf (name == "normal" || name == "controller" || name == "fuzzy") { config = mkIf (name == "normal" || name == "controller" || name == "fuzzy" || name == "rspamd_proxy") {
type = mkDefault name; type = mkDefault name;
includes = mkDefault [ "$CONFDIR/worker-${name}.inc" ]; includes = mkDefault [ "$CONFDIR/worker-${if name == "rspamd_proxy" then "proxy" else name}.inc" ];
bindSockets = mkDefault (if name == "normal" bindSockets =
then [{ let
socket = "/run/rspamd/rspamd.sock"; unixSocket = name: {
mode = "0660"; mode = "0660";
owner = cfg.user; socket = "/run/rspamd/${name}.sock";
group = cfg.group; owner = cfg.user;
}] group = cfg.group;
else if name == "controller" };
then [ "localhost:11334" ] in mkDefault (if name == "normal" then [(unixSocket "rspamd")]
else [] ); else if name == "controller" then [ "localhost:11334" ]
else if name == "rspamd_proxy" then [ (unixSocket "proxy") ]
else [] );
}; };
}; };
@ -284,7 +286,7 @@ in
description = '' description = ''
User to use when no root privileges are required. User to use when no root privileges are required.
''; '';
}; };
group = mkOption { group = mkOption {
type = types.string; type = types.string;