Merge pull request #42153 from Ekleog/opensmtpd-changeable-package

opensmtpd module: allow changing the package

authored by

adisbladis and committed by
GitHub
2f907d5b 8c5ccc93

+10 -3
+10 -3
nixos/modules/services/mail/opensmtpd.nix
··· 10 11 sendmail = pkgs.runCommand "opensmtpd-sendmail" {} '' 12 mkdir -p $out/bin 13 - ln -s ${pkgs.opensmtpd}/sbin/smtpctl $out/bin/sendmail 14 ''; 15 16 in { ··· 25 type = types.bool; 26 default = false; 27 description = "Whether to enable the OpenSMTPD server."; 28 }; 29 30 addSendmailToSystemPath = mkOption { ··· 97 systemd.services.opensmtpd = let 98 procEnv = pkgs.buildEnv { 99 name = "opensmtpd-procs"; 100 - paths = [ pkgs.opensmtpd ] ++ cfg.procPackages; 101 pathsToLink = [ "/libexec/opensmtpd" ]; 102 }; 103 in { ··· 115 chown smtpq.root /var/spool/smtpd/purge 116 chmod 700 /var/spool/smtpd/purge 117 ''; 118 - serviceConfig.ExecStart = "${pkgs.opensmtpd}/sbin/smtpd -d -f ${conf} ${args}"; 119 environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/opensmtpd"; 120 }; 121
··· 10 11 sendmail = pkgs.runCommand "opensmtpd-sendmail" {} '' 12 mkdir -p $out/bin 13 + ln -s ${cfg.package}/sbin/smtpctl $out/bin/sendmail 14 ''; 15 16 in { ··· 25 type = types.bool; 26 default = false; 27 description = "Whether to enable the OpenSMTPD server."; 28 + }; 29 + 30 + package = mkOption { 31 + type = types.package; 32 + default = pkgs.opensmtpd; 33 + defaultText = "pkgs.opensmtpd"; 34 + description = "The OpenSMTPD package to use."; 35 }; 36 37 addSendmailToSystemPath = mkOption { ··· 104 systemd.services.opensmtpd = let 105 procEnv = pkgs.buildEnv { 106 name = "opensmtpd-procs"; 107 + paths = [ cfg.package ] ++ cfg.procPackages; 108 pathsToLink = [ "/libexec/opensmtpd" ]; 109 }; 110 in { ··· 122 chown smtpq.root /var/spool/smtpd/purge 123 chmod 700 /var/spool/smtpd/purge 124 ''; 125 + serviceConfig.ExecStart = "${cfg.package}/sbin/smtpd -d -f ${conf} ${args}"; 126 environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/opensmtpd"; 127 }; 128