Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

exim-retiolum module: replace UCL by "JSON"

Browse Source
This commit is contained in:
tv 2019-06-24 03:15:34 +02:00
parent 3d639bcf87
commit 8a48f8dd68
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
krebs/3modules/exim-retiolum.nix
View File

@ -1,6 +1,15 @@
with import <stockholm/lib>; with import <stockholm/lib>;
{ config, pkgs, lib, ... }: let { config, pkgs, lib, ... }: let
cfg = config.krebs.exim-retiolum; cfg = config.krebs.exim-retiolum;
# Due to improvements to the JSON notation, braces around top-level objects
# are not necessary^Wsupported by rspamd's parser when including files:
# https://github.com/rspamd/rspamd/issues/2674
toMostlyJSON = value:
assert typeOf value == "set";
(s: substring 1 (stringLength s - 2) s)
(toJSON value);
in { in {
options.krebs.exim-retiolum = { options.krebs.exim-retiolum = {
enable = mkEnableOption "krebs.exim-retiolum"; enable = mkEnableOption "krebs.exim-retiolum";
@ -25,12 +34,16 @@ in {
enable = mkEnableOption "krebs.exim-retiolum.rspamd" // { enable = mkEnableOption "krebs.exim-retiolum.rspamd" // {
default = false; default = false;
}; };
local_networks = mkOption { locals = {
type = types.listOf types.cidr; options = {
default = [ local_networks = mkOption {
config.krebs.build.host.nets.retiolum.ip4.prefix type = types.listOf types.cidr;
config.krebs.build.host.nets.retiolum.ip6.prefix default = [
]; config.krebs.build.host.nets.retiolum.ip4.prefix
config.krebs.build.host.nets.retiolum.ip6.prefix
];
};
};
}; };
}; };
}; };
@ -38,9 +51,12 @@ in {
{ {
config = lib.mkIf cfg.rspamd.enable { config = lib.mkIf cfg.rspamd.enable {
services.rspamd.enable = true; services.rspamd.enable = true;
services.rspamd.locals."options.inc".text = '' services.rspamd.locals =
local_networks = ${toJSON cfg.rspamd.local_networks}; mapAttrs'
''; (name: value: nameValuePair "${name}.inc" {
text = toMostlyJSON value;
})
cfg.rspamd.locals;
users.users.${config.krebs.exim.user.name}.extraGroups = [ users.users.${config.krebs.exim.user.name}.extraGroups = [
config.services.rspamd.group config.services.rspamd.group
]; ];