From 91a60bc48c7a3edf372a43611dde9d49692f26f2 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 10 Jan 2020 13:41:28 +0000 Subject: nixos/mailman: make mailman package configurable This will allow users to provide other archiver plugins than the default mailman-hyperkitty. --- nixpkgs/nixos/modules/services/mail/mailman.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/nixpkgs/nixos/modules/services/mail/mailman.nix b/nixpkgs/nixos/modules/services/mail/mailman.nix index e77e33d35dec..1918807586be 100644 --- a/nixpkgs/nixos/modules/services/mail/mailman.nix +++ b/nixpkgs/nixos/modules/services/mail/mailman.nix @@ -69,6 +69,14 @@ in { description = "Enable Mailman on this host. Requires an active Postfix installation."; }; + package = mkOption { + type = types.package; + default = pkgs.mailman; + defaultText = "pkgs.mailman"; + example = "pkgs.mailman.override { archivers = []; }"; + description = "Mailman package to use"; + }; + siteOwner = mkOption { type = types.str; example = "postmaster@example.org"; @@ -207,8 +215,8 @@ in { restartTriggers = [ config.environment.etc."mailman3/mailman.cfg".source ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.mailman}/bin/mailman start"; - ExecStop = "${pkgs.mailman}/bin/mailman stop"; + ExecStart = "${cfg.package}/bin/mailman start"; + ExecStop = "${cfg.package}/bin/mailman stop"; User = "mailman"; Type = "forking"; RuntimeDirectory = "mailman"; @@ -278,7 +286,7 @@ in { startAt = "daily"; restartTriggers = [ config.environment.etc."mailman3/mailman.cfg".source ]; serviceConfig = { - ExecStart = "${pkgs.mailman}/bin/mailman digests --send"; + ExecStart = "${cfg.package}/bin/mailman digests --send"; User = "mailman"; }; }; -- cgit 1.4.1