From d85a0bbe79b3fb5661369b76735eac51ff8ddd79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 25 Aug 2025 00:43:49 +0200 Subject: [PATCH] nixos/rspamd: add and use package option --- nixos/modules/services/mail/rspamd.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index 6795de0c868c..5b09cfb217fb 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -304,8 +304,8 @@ in options = { services.rspamd = { - enable = mkEnableOption "rspamd, the Rapid spam filtering system"; + package = lib.mkPackageOption pkgs "rspamd" { }; debug = mkOption { type = types.bool; @@ -458,7 +458,7 @@ in }; # Allow users to run 'rspamc' and 'rspamadm'. - environment.systemPackages = [ pkgs.rspamd ]; + environment.systemPackages = [ cfg.package ]; users.users.${cfg.user} = { description = "rspamd daemon"; @@ -480,7 +480,7 @@ in restartTriggers = [ rspamdDir ]; serviceConfig = { - ExecStart = "${pkgs.rspamd}/bin/rspamd ${optionalString cfg.debug "-d"} -c /etc/rspamd/rspamd.conf -f"; + ExecStart = "${cfg.package}/bin/rspamd ${optionalString cfg.debug "-d"} -c /etc/rspamd/rspamd.conf -f"; Restart = "always"; User = "${cfg.user}";