aither/simple-nixos-mailserver
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rspamd: use package from upstream NixOS service

Browse Source
This commit is contained in:
Michael Hoang
2026-04-27 12:16:05 +02:00
parent 583a362c5b
commit f810a804c6
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mail-server/dovecot.nix
+2 -2
View File
@@ -188,8 +188,8 @@ in
enablePAM = mkForce false; enablePAM = mkForce false;
sieve.pipeBins = map lib.getExe [ sieve.pipeBins = map lib.getExe [
(pkgs.writeShellScriptBin "rspamd-learn-ham.sh" "exec ${pkgs.rspamd}/bin/rspamc -h /run/rspamd/worker-controller.sock learn_ham") (pkgs.writeShellScriptBin "rspamd-learn-ham.sh" "exec ${lib.getExe' config.services.rspamd.package "rspamc"} -h /run/rspamd/worker-controller.sock learn_ham")
(pkgs.writeShellScriptBin "rspamd-learn-spam.sh" "exec ${pkgs.rspamd}/bin/rspamc -h /run/rspamd/worker-controller.sock learn_spam") (pkgs.writeShellScriptBin "rspamd-learn-spam.sh" "exec ${lib.getExe' config.services.rspamd.package "rspamc"} -h /run/rspamd/worker-controller.sock learn_spam")
]; ];
# https://doc.dovecot.org/2.4.3/core/settings/syntax.html # https://doc.dovecot.org/2.4.3/core/settings/syntax.html
mail-server/environment.nix
+4 -4
View File
@@ -26,11 +26,11 @@ let
in in
{ {
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs; [ environment.systemPackages = [
config.services.dovecot2.package config.services.dovecot2.package
openssh pkgs.openssh
postfix config.services.postfix.package
rspamd config.services.rspamd.package
]; ];
}; };
} }
mail-server/rspamd.nix
+4 -3
View File
@@ -27,6 +27,7 @@ let
postfixCfg = config.services.postfix; postfixCfg = config.services.postfix;
rspamdCfg = config.services.rspamd; rspamdCfg = config.services.rspamd;
rspamdPkg = config.services.rspamd.package;
rspamdUser = config.services.rspamd.user; rspamdUser = config.services.rspamd.user;
rspamdGroup = config.services.rspamd.group; rspamdGroup = config.services.rspamd.group;
@@ -45,7 +46,7 @@ let
pkgs.writeShellScript "dkim-keygen-${domain}-${selector}" '' pkgs.writeShellScript "dkim-keygen-${domain}-${selector}" ''
if [ ! -f "${privkey}" ] if [ ! -f "${privkey}" ]
then then
${lib.getExe' pkgs.rspamd "rspamadm"} dkim_keygen ${ ${lib.getExe' rspamdPkg "rspamadm"} dkim_keygen ${
lib.cli.toCommandLineShellGNU { } { lib.cli.toCommandLineShellGNU { } {
inherit inherit
domain domain
@@ -114,7 +115,7 @@ in
nativeBuildInputs = with pkgs; [ makeWrapper ]; nativeBuildInputs = with pkgs; [ makeWrapper ];
} }
'' ''
makeWrapper ${pkgs.rspamd}/bin/rspamc $out/bin/rspamc \ makeWrapper ${lib.getExe' rspamdPkg "rspamc"} $out/bin/rspamc \
--add-flags "-h /run/rspamd/worker-controller.sock" --add-flags "-h /run/rspamd/worker-controller.sock"
'' ''
) )
@@ -288,7 +289,7 @@ in
# default behaviour when called without a date. # default behaviour when called without a date.
# https://github.com/rspamd/rspamd/issues/4062 # https://github.com/rspamd/rspamd/issues/4062
script = toString [ script = toString [
(lib.getExe' pkgs.rspamd "rspamadm") (lib.getExe' rspamdPkg "rspamadm")
"dmarc_report" "dmarc_report"
"$(date -d 'yesterday' '+%Y%m%d')" "$(date -d 'yesterday' '+%Y%m%d')"
]; ];