
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.
Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.
A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.
This commit was automatically created and can be verified using
nix-build a08b3a4d19
.tar.gz \
--argstr baseRev b32a0943687d2a5094a6d92f25a4b6e16a76b5b7
result/bin/apply-formatting $NIXPKGS_PATH
113 lines
3.6 KiB
Nix
113 lines
3.6 KiB
Nix
import ../make-test-python.nix (
|
|
{ pkgs, ... }:
|
|
let
|
|
certs = import ../common/acme/server/snakeoil-certs.nix;
|
|
domain = certs.domain;
|
|
in
|
|
{
|
|
name = "maddy-tls";
|
|
meta = with pkgs.lib.maintainers; {
|
|
maintainers = [ onny ];
|
|
};
|
|
|
|
nodes = {
|
|
server =
|
|
{ options, ... }:
|
|
{
|
|
services.maddy = {
|
|
enable = true;
|
|
hostname = domain;
|
|
primaryDomain = domain;
|
|
openFirewall = true;
|
|
ensureAccounts = [ "postmaster@${domain}" ];
|
|
ensureCredentials = {
|
|
# Do not use this in production. This will make passwords world-readable
|
|
# in the Nix store
|
|
"postmaster@${domain}".passwordFile = "${pkgs.writeText "postmaster" "test"}";
|
|
};
|
|
tls = {
|
|
loader = "file";
|
|
certificates = [
|
|
{
|
|
certPath = "${certs.${domain}.cert}";
|
|
keyPath = "${certs.${domain}.key}";
|
|
}
|
|
];
|
|
};
|
|
# Enable TLS listeners. Configuring this via the module is not yet
|
|
# implemented.
|
|
config =
|
|
builtins.replaceStrings
|
|
[
|
|
"imap tcp://0.0.0.0:143"
|
|
"submission tcp://0.0.0.0:587"
|
|
]
|
|
[
|
|
"imap tls://0.0.0.0:993 tcp://0.0.0.0:143"
|
|
"submission tls://0.0.0.0:465 tcp://0.0.0.0:587"
|
|
]
|
|
options.services.maddy.config.default;
|
|
};
|
|
# Not covered by openFirewall yet
|
|
networking.firewall.allowedTCPPorts = [
|
|
993
|
|
465
|
|
];
|
|
};
|
|
|
|
client =
|
|
{ nodes, ... }:
|
|
{
|
|
security.pki.certificateFiles = [
|
|
certs.ca.cert
|
|
];
|
|
networking.extraHosts = ''
|
|
${nodes.server.networking.primaryIPAddress} ${domain}
|
|
'';
|
|
environment.systemPackages = [
|
|
(pkgs.writers.writePython3Bin "send-testmail" { } ''
|
|
import smtplib
|
|
import ssl
|
|
from email.mime.text import MIMEText
|
|
|
|
context = ssl.create_default_context()
|
|
msg = MIMEText("Hello World")
|
|
msg['Subject'] = 'Test'
|
|
msg['From'] = "postmaster@${domain}"
|
|
msg['To'] = "postmaster@${domain}"
|
|
with smtplib.SMTP_SSL(host='${domain}', port=465, context=context) as smtp:
|
|
smtp.login('postmaster@${domain}', 'test')
|
|
smtp.sendmail(
|
|
'postmaster@${domain}', 'postmaster@${domain}', msg.as_string()
|
|
)
|
|
'')
|
|
(pkgs.writers.writePython3Bin "test-imap" { } ''
|
|
import imaplib
|
|
|
|
with imaplib.IMAP4_SSL('${domain}') as imap:
|
|
imap.login('postmaster@${domain}', 'test')
|
|
imap.select()
|
|
status, refs = imap.search(None, 'ALL')
|
|
assert status == 'OK'
|
|
assert len(refs) == 1
|
|
status, msg = imap.fetch(refs[0], 'BODY[TEXT]')
|
|
assert status == 'OK'
|
|
assert msg[0][1].strip() == b"Hello World"
|
|
'')
|
|
];
|
|
};
|
|
};
|
|
|
|
testScript = ''
|
|
start_all()
|
|
server.wait_for_unit("maddy.service")
|
|
server.wait_for_open_port(143)
|
|
server.wait_for_open_port(993)
|
|
server.wait_for_open_port(587)
|
|
server.wait_for_open_port(465)
|
|
client.succeed("send-testmail")
|
|
client.succeed("test-imap")
|
|
'';
|
|
}
|
|
)
|