Compare commits

..

2 commits

View file

@ -208,55 +208,52 @@ in
}; };
systemd = { systemd = {
tmpfiles.settings."10-crowdsec" = { tmpfiles.settings."10-crowdsec" = lib.mkIf (cfg.parserWhitelist != [ ]) {
"${cfg.stateDirectory}".d = { "${cfg.stateDirectory}".d = {
user = "crowdsec"; user = "crowdsec";
group = "crowdsec"; group = "crowdsec";
mode = "0700"; mode = "0700";
}; };
# This must be created for the setup service to work
"${cfg.stateDirectory}/config".d = { "${cfg.stateDirectory}/config".d = {
user = "crowdsec"; user = "crowdsec";
group = "crowdsec"; group = "crowdsec";
mode = "0700"; mode = "0700";
}; };
"${cfg.stateDirectory}/config/parsers".d = lib.mkIf (cfg.parserWhitelist != [ ]) { "${cfg.stateDirectory}/config/parsers".d = {
user = "crowdsec"; user = "crowdsec";
group = "crowdsec"; group = "crowdsec";
mode = "0700"; mode = "0700";
}; };
"${cfg.stateDirectory}/config/parsers/s02-enrich".d = lib.mkIf (cfg.parserWhitelist != [ ]) { "${cfg.stateDirectory}/config/parsers/s02-enrich".d = {
user = "crowdsec"; user = "crowdsec";
group = "crowdsec"; group = "crowdsec";
mode = "0700"; mode = "0700";
}; };
"${cfg.stateDirectory}/config/parsers/s02-enrich/nixos-whitelist.yaml" = "${cfg.stateDirectory}/config/parsers/s02-enrich/nixos-whitelist.yaml" = {
lib.mkIf (cfg.parserWhitelist != [ ]) "L+".argument =
{ (settingsFormat.generate "crowdsec-nixos-whitelist.yaml" {
"L+".argument = name = "nixos/parser-whitelist";
(settingsFormat.generate "crowdsec-nixos-whitelist.yaml" { description = "Parser whitelist generated by the crowdsec NixOS module";
name = "nixos/parser-whitelist"; whitelist = {
description = "Parser whitelist generated by the crowdsec NixOS module"; reason = "Filtered by NixOS whitelist";
whitelist = { ip = lib.lists.filter (ip: !(lib.hasInfix "/" ip)) cfg.parserWhitelist;
reason = "Filtered by NixOS whitelist"; cidr = lib.lists.filter (ip: lib.hasInfix "/" ip) cfg.parserWhitelist;
ip = lib.lists.filter (ip: !(lib.hasInfix "/" ip)) cfg.parserWhitelist; };
cidr = lib.lists.filter (ip: lib.hasInfix "/" ip) cfg.parserWhitelist; }).outPath;
}; };
}).outPath;
};
}; };
services = { services = {
crowdsec-setup = { crowdsec-setup = {
# TODO(tlater): Depend on tmpfiles path for
# /var/lib/crowdsec/config
description = "Crowdsec database and config preparation"; description = "Crowdsec database and config preparation";
script = '' script = ''
mkdir -p '${cfg.stateDirectory}/'{config,}
if [ ! -e '${cfg.settings.config_paths.simulation_path}' ]; then if [ ! -e '${cfg.settings.config_paths.simulation_path}' ]; then
cp '${cfg.package}/share/crowdsec/config/simulation.yaml' '${cfg.settings.config_paths.simulation_path}' cp '${cfg.package}/share/crowdsec/config/simulation.yaml' '${cfg.settings.config_paths.simulation_path}'
fi fi