mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 08:23:09 +00:00
Merge pull request #42153 from Ekleog/opensmtpd-changeable-package
opensmtpd module: allow changing the package
This commit is contained in:
commit
2f907d5ba1
@ -10,7 +10,7 @@ let
|
||||
|
||||
sendmail = pkgs.runCommand "opensmtpd-sendmail" {} ''
|
||||
mkdir -p $out/bin
|
||||
ln -s ${pkgs.opensmtpd}/sbin/smtpctl $out/bin/sendmail
|
||||
ln -s ${cfg.package}/sbin/smtpctl $out/bin/sendmail
|
||||
'';
|
||||
|
||||
in {
|
||||
@ -27,6 +27,13 @@ in {
|
||||
description = "Whether to enable the OpenSMTPD server.";
|
||||
};
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.opensmtpd;
|
||||
defaultText = "pkgs.opensmtpd";
|
||||
description = "The OpenSMTPD package to use.";
|
||||
};
|
||||
|
||||
addSendmailToSystemPath = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
@ -97,7 +104,7 @@ in {
|
||||
systemd.services.opensmtpd = let
|
||||
procEnv = pkgs.buildEnv {
|
||||
name = "opensmtpd-procs";
|
||||
paths = [ pkgs.opensmtpd ] ++ cfg.procPackages;
|
||||
paths = [ cfg.package ] ++ cfg.procPackages;
|
||||
pathsToLink = [ "/libexec/opensmtpd" ];
|
||||
};
|
||||
in {
|
||||
@ -115,7 +122,7 @@ in {
|
||||
chown smtpq.root /var/spool/smtpd/purge
|
||||
chmod 700 /var/spool/smtpd/purge
|
||||
'';
|
||||
serviceConfig.ExecStart = "${pkgs.opensmtpd}/sbin/smtpd -d -f ${conf} ${args}";
|
||||
serviceConfig.ExecStart = "${cfg.package}/sbin/smtpd -d -f ${conf} ${args}";
|
||||
environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/opensmtpd";
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user