mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-10 03:23:29 +03:00
nixos/opensmtpd: run nixfmt as requested by ci
This commit is contained in:
parent
fb4ff06a4b
commit
69a8aba113
2 changed files with 24 additions and 20 deletions
|
@ -113,11 +113,13 @@ in
|
||||||
source = "${cfg.package}/bin/smtpctl";
|
source = "${cfg.package}/bin/smtpctl";
|
||||||
};
|
};
|
||||||
|
|
||||||
services.mail.sendmailSetuidWrapper = lib.mkIf cfg.setSendmail
|
services.mail.sendmailSetuidWrapper = lib.mkIf cfg.setSendmail (
|
||||||
(security.wrappers.smtpctl // {
|
security.wrappers.smtpctl
|
||||||
|
// {
|
||||||
source = "${sendmail}/bin/sendmail";
|
source = "${sendmail}/bin/sendmail";
|
||||||
program = "sendmail";
|
program = "sendmail";
|
||||||
});
|
}
|
||||||
|
);
|
||||||
|
|
||||||
systemd.tmpfiles.rules = [
|
systemd.tmpfiles.rules = [
|
||||||
"d /var/spool/smtpd 711 root - - -"
|
"d /var/spool/smtpd 711 root - - -"
|
||||||
|
|
|
@ -16,7 +16,8 @@ import ./make-test-python.nix {
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
environment.systemPackages = let
|
environment.systemPackages =
|
||||||
|
let
|
||||||
testSendmail = pkgs.writeScriptBin "test-sendmail" ''
|
testSendmail = pkgs.writeScriptBin "test-sendmail" ''
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -euxo pipefail
|
set -euxo pipefail
|
||||||
|
@ -30,7 +31,8 @@ import ./make-test-python.nix {
|
||||||
EOF
|
EOF
|
||||||
echo "=========== FINISHED SENDING" >&2
|
echo "=========== FINISHED SENDING" >&2
|
||||||
'';
|
'';
|
||||||
in [
|
in
|
||||||
|
[
|
||||||
pkgs.opensmtpd
|
pkgs.opensmtpd
|
||||||
testSendmail
|
testSendmail
|
||||||
];
|
];
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue